商品详情页新增返回商品对应单位/重量

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -33,7 +33,7 @@ import static cn.lili.common.enums.ResultCode.GOODS_ERROR;
  * @since 2020/11/17 7:30 下午
  */
 @Data
-@TableName("li_order_item")
+@TableName(value = "li_order_item", excludeProperty = {"unit"})
 @ApiModel(value = "子订单")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -62,6 +62,9 @@ public class OrderItem extends BaseEntity {
     @ApiModelProperty(value = "销售量")
     private Integer num;
 
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
     @ApiModelProperty(value = "交易编号")
     private String tradeSn;
 

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.lili.modules.order.order.serviceimpl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.CharSequenceUtil;
@@ -16,7 +17,11 @@ import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.SnowFlake;
+import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
+import cn.lili.modules.goods.mapper.GoodsMapper;
+import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.goods.serviceimpl.GoodsServiceImpl;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.customs.JiangyinServiceManager;
@@ -121,6 +126,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      */
     @Autowired
     private OrderLogService orderLogService;
+
+    @Autowired
+    private GoodsMapper goodsMapper;
     /**
      * RocketMQ
      */
@@ -284,6 +292,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         orderItemWrapper.eq(ORDER_SN_COLUMN, orderSn);
         //查询订单项信息
         List<OrderItem> orderItems = orderItemMapper.selectList(orderItemWrapper);
+        if (!CollectionUtil.isEmpty(orderItems)){
+            List<String> goodsIds = orderItems.stream().map(OrderItem::getGoodsId).collect(Collectors.toList());
+            List<Goods> goods = goodsMapper.selectList(new QueryWrapper<Goods>().lambda().in(Goods::getId, goodsIds));
+            Map<String, String> id2Unit = goods.stream().collect(Collectors.toMap(Goods::getId, Goods::getGoodsUnit));
+            for (OrderItem orderItem : orderItems) {
+                orderItem.setUnit(id2Unit.get(orderItem.getGoodsId()));
+            }
+        }
         //查询订单日志信息
         List<OrderLog> orderLogs = orderLogService.getOrderLog(orderSn);
         //查询发票信息