订单bug

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -87,7 +87,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
 
         Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-
         return page;
     }
 
@@ -100,12 +99,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
 
         // 订单
         OrderInfoVo result = BeanUtil.toBean(orderInfo, OrderInfoVo.class);
+
+        // 赋值事业部名称
         Department department = departmentService.getById(orderInfo.getDepartmentId());
         if (department != null) {
             result.setDepartmentName(department.getName());
         }
 
-        // 订单明细
+        // 赋值订单明细
         List<OrderSku> tempOrderSkuList = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id));
         List<OrderSkuVo> orderSkuList = BeanUtil.copyToList(tempOrderSkuList, OrderSkuVo.class);
         skuSpecService.attributeAssign(orderSkuList, OrderSkuVo::getSkuSpecId, (item, skuSpec) -> {
@@ -117,7 +118,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         });
         result.setOrderSkuList(orderSkuList);
 
-        // 包材配件/单品
+        // 赋值包材配件/单品
         List<OrderSkuBom> tempOrderSkuBomList = orderSkuBomService.list(q -> q.eq(OrderSkuBom::getOrderId, id));
         List<OrderSkuBomVo> orderSkuBomList = BeanUtil.copyToList(tempOrderSkuBomList, OrderSkuBomVo.class);
         bomSpecService.attributeAssign(orderSkuBomList, OrderSkuBom::getBomSpecId, (item, bomSpec) -> {
@@ -150,9 +151,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         orderSkuService.saveBatch(tempOrderSkuList);
 
         List<OrderSkuBom> orderSkuBomList = orderSkuList.stream()
-                .peek(item -> item.setOrderId(orderDto.getId()))
-                .flatMap(orderSku -> orderSku.getOrderSkuBomList()
-                        .stream().peek(orderSkuBom -> orderSkuBom.setOrderSkuId(orderSku.getId())))
+                .flatMap(orderSku -> orderSku.getOrderSkuBomList().stream()
+                        .peek(orderSkuBom -> orderSkuBom.setOrderId(orderDto.getId()))
+                        .peek(orderSkuBom -> orderSkuBom.setOrderSkuId(orderSku.getId())))
                 .collect(Collectors.toList());
         orderSkuBomService.saveBatch(orderSkuBomList);
 
@@ -177,9 +178,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         orderSkuService.saveOrUpdateBatch(tempOrderSkuList);
 
         List<OrderSkuBom> orderSkuBomList = orderSkuList.stream()
-                .peek(item -> item.setOrderId(orderDto.getId()))
-                .flatMap(orderSku -> orderSku.getOrderSkuBomList()
-                        .stream().peek(orderSkuBom -> orderSkuBom.setOrderSkuId(orderSku.getId())))
+                .flatMap(orderSku -> orderSku.getOrderSkuBomList().stream()
+                        .peek(orderSkuBom -> orderSkuBom.setOrderId(orderDto.getId()))
+                        .peek(orderSkuBom -> orderSkuBom.setOrderSkuId(orderSku.getId())))
                 .collect(Collectors.toList());
         orderSkuBomService.saveOrUpdateBatch(orderSkuBomList);
 

sd-business/src/main/resources/mapper/order/OrderOperatingLogMapper.xml

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderOperatingLogVo">
         select ool.id,
                ool.order_id,
+               ool.order_code,
                ool.type,
                ool.create_user,
                ool.create_time,