需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -55,6 +55,7 @@ public class PayOrderController {
     public ResponseHelper<Page<WorkerOrder>> orderPage(
             @ApiParam(required = false, value = "商品类型 M=辅材 P=配件") @RequestParam(required = false) String goodsType,
             @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
+            @ApiParam(required = false, value = "工单号") @RequestParam(required = false) String workerOrderId,
             @ApiParam(required = false, value = "销售类型 OWN自有 OUT 外购") @RequestParam(required = false) String settlementType,
             @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime,
             @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime,
@@ -63,7 +64,7 @@ public class PayOrderController {
             @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
             @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws Exception {
-        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(yearMonth, settlementType, goodsType, orderId, startTime, endTime, payStatus, pageNum, pageSize);
+        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(workerOrderId,yearMonth, settlementType, goodsType, orderId, startTime, endTime, payStatus, pageNum, pageSize);
         return ResponseHelper.success(workerOrderVOPage);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -885,7 +885,7 @@ public class PayOrderLogic {
 
     }
 
-    public Page<WorkerOrder> orderPage(String yearMonth,String settlementType,String goodsType, String orderId, String startTime, String endTime, String payStatus, Integer pageNum, Integer pageSize) {
+    public Page<WorkerOrder> orderPage(String workerOrderId,String yearMonth,String settlementType,String goodsType, String orderId, String startTime, String endTime, String payStatus, Integer pageNum, Integer pageSize) {
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         String startMonTime = null;
@@ -900,6 +900,7 @@ public class PayOrderLogic {
                 .like(!StringUtil.isEmpty(goodsType),WorkerOrder::getGoodsType,goodsType)
                 .like(!StringUtil.isEmpty(settlementType),WorkerOrder::getSettlementType,settlementType)
                 .eq(!StringUtil.isEmpty(orderId),WorkerOrder::getOrderId,orderId)
+                .eq(!StringUtil.isEmpty(workerOrderId),WorkerOrder::getWorkerOrderId,workerOrderId)
                 .and(!StringUtil.isEmpty(payStatus),item -> item
                 .eq(!StringUtil.isEmpty(payStatus),WorkerOrder::getPayStatus,payStatus)