|
|
@@ -24,6 +24,8 @@ import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import org.springblade.common.enums.AppConstant;
|
|
|
+import org.springblade.common.enums.GoodsConstant;
|
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
|
@@ -93,5 +95,23 @@ public class AppGoodsBillsController extends BladeController {
|
|
|
return R.data(GoodsBillsWrapper.build().pageVO(pages));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 商户的订单中心
|
|
|
+ * @param goodsBills
|
|
|
+ * @param query
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @GetMapping("/listShop")
|
|
|
+ @ApiOperationSupport(order = 2)
|
|
|
+ @ApiOperation(value = "分页", notes = "传入goodsBills")
|
|
|
+ public R<IPage<GoodsBillsVO>> listShop(GoodsBills goodsBills, Query query, String goodsStatus) {
|
|
|
+ //只查询出付款成功的订单
|
|
|
+ IPage<GoodsBills> pages = appGoodsBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsBills).lambda()
|
|
|
+ .eq(GoodsBills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
|
|
|
+ .eq(StrUtil.isNotBlank(goodsStatus),GoodsBills::getOrderStatus,goodsStatus)
|
|
|
+ .orderByDesc(GoodsBills::getCreateTime));
|
|
|
+ return R.data(GoodsBillsWrapper.build().pageVO(pages));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|
