FengChaoYu 2 hete
szülő
commit
0e67713122

+ 5 - 1
mall-server-api/src/main/java/com/gree/mall/manager/bean/order/OrderDetailSon.java

@@ -1,10 +1,13 @@
 package com.gree.mall.manager.bean.order;
 
 
+import com.gree.mall.manager.plus.entity.GoodsMaterialItem;
 import com.gree.mall.manager.plus.entity.OrderDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class OrderDetailSon extends OrderDetail {
 
@@ -14,5 +17,6 @@ public class OrderDetailSon extends OrderDetail {
     @ApiModelProperty(value = "发货仓库存")
     private Integer stockOnQty;
 
-
+    @ApiModelProperty(value = "物料明细")
+    private List<GoodsMaterialItem> items;
 }

+ 6 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -862,6 +862,12 @@ public class OrderLogic {
                     orderDetailSon.setStockOnQty(integerQty);
                 }
 
+                // 获取物料明细
+                final List<GoodsMaterialItem> goodsMaterialItems = goodsMaterialItemService.lambdaQuery()
+                        .eq(GoodsMaterialItem::getGoodsMaterialId, orderDetail.getGoodsMaterialId())
+                        .list();
+                orderDetailSon.setItems(goodsMaterialItems);
+
                 orderDetailSons.add(orderDetailSon);
             }
         }