需求

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

@@ -2,7 +2,9 @@ package com.gree.mall.manager.bean.order;
 
 import com.gree.mall.manager.bean.websit.SettlementOrderDetail;
 import com.gree.mall.manager.plus.entity.PgOrderBase;
+import com.gree.mall.manager.plus.entity.PgOrderDetail;
 import com.gree.mall.manager.plus.entity.PgOrderOperatorLog;
+import com.gree.mall.manager.plus.entity.PgOrderProduct;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,6 +16,11 @@ public class PgOrderBaseDetail extends PgOrderBase {
     @ApiModelProperty("操作日志")
     private List<PgOrderOperatorLog> pgOrderOperatorLogs;
 
+
+    @ApiModelProperty("机型")
+    private List<PgOrderProduct> pgOrderProducts;
+
+
     @ApiModelProperty("辅材明细")
     private List<SettlementOrderDetail> settlementOrderDetails;
 }

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

@@ -128,8 +128,9 @@ public class OrderBaseController {
     @ApiNotAuth
     @PostMapping("/orderDetailJsm")
     @ApiOperation(value = "保存工单jsm")
-    public ResponseHelper<List<PgOrderBaseDetail>> orderDetailJsm(@RequestParam(required = false) String saleOrderId){
-        List<PgOrderBaseDetail> orderBaseId = orderBaseLogic.orderDetailJsm(saleOrderId);
+    public ResponseHelper<List<PgOrderBaseDetail>> orderDetailJsm(@RequestParam(required = false) String saleOrderId,
+                                                                  @RequestParam(required = false) List<String> workerOrderIds){
+        List<PgOrderBaseDetail> orderBaseId = orderBaseLogic.orderDetailJsm(saleOrderId,workerOrderIds);
         return ResponseHelper.success(orderBaseId);
     }
 

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

@@ -107,6 +107,7 @@ public class OrderBaseLogic {
     private final PgOrderOperatorLogService pgOrderOperatorLogService;
     private final SettlementOrderService settlementOrderService;
     private final SettlementOrderItemService settlementOrderItemService;
+    private final PgOrderDetailService pgOrderDetailService;
 
     /**
      * 工单列表
@@ -2309,8 +2310,14 @@ public class OrderBaseLogic {
         orderLogLogic.addLog(orderBaseId, "取消工单", "取消工单-家盛茂商城api", "");
     }
 
-    public List<PgOrderBaseDetail> orderDetailJsm(String saleOrderId) {
-        List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery().eq(PgOrderBase::getSaleOrderId, saleOrderId)
+    public List<PgOrderBaseDetail> orderDetailJsm(String saleOrderId,List<String> workerOrderIds) {
+
+        if (StringUtil.isEmpty(saleOrderId) && CollectionUtil.isEmpty(workerOrderIds))
+            return null;
+
+        List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery()
+                .eq(!StringUtil.isEmpty(saleOrderId),PgOrderBase::getSaleOrderId, saleOrderId)
+                .in(!CollectionUtil.isEmpty(workerOrderIds),PgOrderBase::getId, workerOrderIds)
                 .list();
 
         List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();
@@ -2341,6 +2348,12 @@ public class OrderBaseLogic {
 
             pgOrderBaseDetails.add(pgOrderBaseDetail);
 
+            List<PgOrderProduct> pgOrderProducts = pgOrderProductService.lambdaQuery()
+                    .eq(PgOrderProduct::getOrderBaseId, pgOrderBase.getId())
+                    .list();
+
+            pgOrderBaseDetail.setPgOrderProducts(pgOrderProducts);
+
         }
 
         return pgOrderBaseDetails;