需求

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

@@ -1009,7 +1009,7 @@ public class PayOrderLogic {
                         .or(iter -> iter.eq(WorkerOrder::getRefundStatus, IsYesNoEnum.YES.getKey()))
                 )
                 .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
-                        .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                        .or(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber())).eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
                 )
                 .between(!StringUtil.isEmpty(startTime), WorkerOrder::getCreateTime, startTime, endTime)
                 .in(WorkerOrder::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/JsmWorkerOrder.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class JsmWorkerOrder {
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("订单号")
+    private List<String> workerOrderIds;
+
+    @ApiModelProperty("订单号")
+    private Integer pageNo;
+
+    @ApiModelProperty("订单号")
+    private Integer pageSize;
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -9,6 +9,7 @@ import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.listvo.param.WorkOrderZfireParam;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBase2VO;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBaseVO;
+import com.gree.mall.manager.bean.order.JsmWorkerOrder;
 import com.gree.mall.manager.bean.order.PgOrderBaseDetail;
 import com.gree.mall.manager.bean.workorder.OrderAddBean2DTO;
 import com.gree.mall.manager.bean.workorder.OrderAddBeanDTO;
@@ -127,7 +128,7 @@ public class OrderBaseController {
 
     @ApiNotAuth
     @PostMapping("/orderDetailJsm")
-    @ApiOperation(value = "保存工单jsm")
+    @ApiOperation(value = "工单jsm")
     public ResponseHelper<List<PgOrderBaseDetail>> orderDetailJsm(@RequestParam(required = false) String saleOrderId,
                                                                   @RequestParam(required = false) List<String> workerOrderIds){
         List<PgOrderBaseDetail> orderBaseId = orderBaseLogic.orderDetailJsm(saleOrderId,workerOrderIds);
@@ -135,6 +136,15 @@ public class OrderBaseController {
     }
 
 
+    @ApiNotAuth
+    @PostMapping("/orderDetailJsmMini")
+    @ApiOperation(value = "工单jsm")
+    public ResponseHelper<IPage<PgOrderBaseDetail>> orderDetailJsmMini(@Valid @RequestBody JsmWorkerOrder jsmWorkerOrder){
+        IPage<PgOrderBaseDetail> orderBaseId = orderBaseLogic.orderDetailJsmMini(jsmWorkerOrder);
+        return ResponseHelper.success(orderBaseId);
+    }
+
+
     @PostMapping("/update")
     @ApiOperation(value = "修改工单")
     public ResponseHelper update(@Valid @RequestBody PgOrderBase pgOrderBase){

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -16,6 +16,7 @@ import com.gree.mall.manager.bean.listvo.param.WorkOrderZfireParam;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBase2VO;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBaseAppraiseVO;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBaseVO;
+import com.gree.mall.manager.bean.order.JsmWorkerOrder;
 import com.gree.mall.manager.bean.order.PgOrderBaseDetail;
 import com.gree.mall.manager.bean.websit.SettlementOrderDetail;
 import com.gree.mall.manager.bean.workorder.OrderAddBean2DTO;
@@ -2358,4 +2359,60 @@ public class OrderBaseLogic {
 
         return pgOrderBaseDetails;
     }
+
+    public IPage<PgOrderBaseDetail> orderDetailJsmMini(JsmWorkerOrder jsmWorkerOrder) {
+
+        if (CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()))
+            return null;
+
+        List<String> status = new ArrayList<>();
+        if (!StringUtil.isEmpty(jsmWorkerOrder.getStatus())){
+
+        }
+
+        IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
+                .in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+
+                .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+
+        List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();
+
+        for (Object o : pgOrderBases.getRecords()) {
+
+            PgOrderBase pgOrderBase = (PgOrderBase) o;
+            PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
+
+            List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
+                    .eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
+                    .orderByDesc(PgOrderOperatorLog::getId)
+                    .list();
+
+            List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery().eq(SettlementOrder::getWorkerOrderId, pgOrderBase.getId()).list();
+
+            List<SettlementOrderDetail> settlementOrderDetails = new ArrayList<>();
+            for (SettlementOrder settlementOrder : settlementOrderList) {
+                SettlementOrderDetail settlementOrderDetail = BeanUtil.toBean(settlementOrder, SettlementOrderDetail.class);
+
+                List<SettlementOrderItem> settlementOrderItems = settlementOrderItemService.lambdaQuery().eq(SettlementOrderItem::getSettlementOrderId, settlementOrder.getSettlementOrderId())
+                        .list();
+
+                settlementOrderDetail.setSettlementOrderItemList(settlementOrderItems);
+
+                settlementOrderDetails.add(settlementOrderDetail);
+            }
+            pgOrderBaseDetail.setPgOrderOperatorLogs(pgOrderOperatorLogs);
+            pgOrderBaseDetail.setSettlementOrderDetails(settlementOrderDetails);
+
+            pgOrderBaseDetails.add(pgOrderBaseDetail);
+
+            List<PgOrderProduct> pgOrderProducts = pgOrderProductService.lambdaQuery()
+                    .eq(PgOrderProduct::getOrderBaseId, pgOrderBase.getId())
+                    .list();
+
+            pgOrderBaseDetail.setPgOrderProducts(pgOrderProducts);
+
+        }
+        pgOrderBases.setRecords(pgOrderBaseDetails);
+        return pgOrderBases;
+    }
 }