需求

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

@@ -0,0 +1,19 @@
+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.PgOrderOperatorLog;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PgOrderBaseDetail extends PgOrderBase {
+
+    @ApiModelProperty("操作日志")
+    private List<PgOrderOperatorLog> pgOrderOperatorLogs;
+
+    @ApiModelProperty("辅材明细")
+    private List<SettlementOrderDetail> settlementOrderDetails;
+}

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.PgOrderBaseDetail;
 import com.gree.mall.manager.bean.workorder.OrderAddBean2DTO;
 import com.gree.mall.manager.bean.workorder.OrderAddBeanDTO;
 import com.gree.mall.manager.bean.workorder.OrderSettleDetailBean;
@@ -123,6 +124,16 @@ 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);
+        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,8 @@ 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.PgOrderBaseDetail;
+import com.gree.mall.manager.bean.websit.SettlementOrderDetail;
 import com.gree.mall.manager.bean.workorder.OrderAddBean2DTO;
 import com.gree.mall.manager.bean.workorder.OrderAddBeanDTO;
 import com.gree.mall.manager.commonmapper.CommonMapper;
@@ -101,6 +103,9 @@ public class OrderBaseLogic {
     private final PgAppraiseConfigService pgAppraiseConfigService;
     private final ElasticsearchRestTemplate elasticsearchRestTemplate;
     private final WebsitDispatchService websitDispatchService;
+    private final PgOrderOperatorLogService pgOrderOperatorLogService;
+    private final SettlementOrderService settlementOrderService;
+    private final SettlementOrderItemService settlementOrderItemService;
 
     /**
      * 工单列表
@@ -2283,4 +2288,38 @@ public class OrderBaseLogic {
 
         orderLogLogic.addLog(orderBaseId, "取消工单", "取消工单-家盛茂商城api", "");
     }
+
+    public List<PgOrderBaseDetail> orderDetailJsm(String saleOrderId) {
+        List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery().eq(PgOrderBase::getSaleOrderId, saleOrderId)
+                .list();
+
+        List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();
+
+        for (PgOrderBase pgOrderBase : pgOrderBases) {
+            PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
+
+            List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery().eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.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);
+
+        }
+
+        return pgOrderBaseDetails;
+    }
 }