门店供应链物品管理/记录

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsOrderMgrController.java

@@ -130,9 +130,10 @@ public class ChannelGoodsOrderMgrController extends BaseApiController {
             DeliveryCompany deliveryCompany = deliveryCompanyService.getById(goodsOrderInfoVO.getDeliveryId());
             goodsOrderInfoVO.setDeliveryCompany(deliveryCompany);
         }
-        List<ChannelGoodsOrderItem> item = channelGoodsOrderItemService.list(new QueryWrapper<ChannelGoodsOrderItem>().eq("order_id", order.getOrderId()));
-
-        goodsOrderInfoVO.setChannelGoodsOrderItem(item);
+        QueryWrapper<ChannelGoodsOrderItem> goodsOrderItemQueryWrapper = new QueryWrapper<>();
+        goodsOrderItemQueryWrapper.eq("t1.order_id", order.getOrderId());
+        List<ChannelGoodsOrderItemVO> orderItemVOList = channelGoodsOrderItemService.selectChannelGoodsOrderItemVOList(goodsOrderItemQueryWrapper);
+        goodsOrderInfoVO.setChannelGoodsOrderItem(orderItemVOList);
         return AjaxResult.success(goodsOrderInfoVO);
     }
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelGoodsOrderController.java

@@ -3,6 +3,7 @@ package com.qs.mp.web.controller.api.channel.mall;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.Goods;
 import com.qs.mp.admin.domain.vo.ShippingTemplateCalculateVO;
 import com.qs.mp.admin.service.IGoodsService;
@@ -161,9 +162,9 @@ public class ChannelGoodsOrderController extends BaseApiController {
             DeliveryCompany deliveryCompany = deliveryCompanyService.getById(goodsOrderInfoVO.getDeliveryId());
             goodsOrderInfoVO.setDeliveryCompany(deliveryCompany);
         }
-
-        List<ChannelGoodsOrderItem> goodsOrderItem = channelGoodsOrderItemService.list(new LambdaQueryWrapper<ChannelGoodsOrderItem>().eq(ChannelGoodsOrderItem::getOrderId, goodsOrder.getOrderId()));
-
+        QueryWrapper<ChannelGoodsOrderItem> goodsOrderItemQueryWrapper = new QueryWrapper<>();
+        goodsOrderItemQueryWrapper.eq("t1.order_id", goodsOrder.getOrderId());
+        List<ChannelGoodsOrderItemVO> goodsOrderItem = channelGoodsOrderItemService.selectChannelGoodsOrderItemVOList(goodsOrderItemQueryWrapper);
         goodsOrderInfoVO.setChannelGoodsOrderItem(goodsOrderItem);
 
         return AjaxResult.success(goodsOrderInfoVO);

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelGoodsOrderInfoVO.java

@@ -27,6 +27,6 @@ public class ChannelGoodsOrderInfoVO extends ChannelGoodsOrder {
     private ChannelVO channel;
 
     @ApiModelProperty("采购商品订单详情")
-    private List<ChannelGoodsOrderItem> channelGoodsOrderItem;
+    private List<ChannelGoodsOrderItemVO> channelGoodsOrderItem;
 
 }

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelGoodsOrderItemVO.java

@@ -16,4 +16,10 @@ public class ChannelGoodsOrderItemVO extends ChannelGoodsOrderItem {
 
     @ApiModelProperty("商品名称")
     private String title;
+
+    @ApiModelProperty("商品采购价格")
+    private Integer purchasePrice;
+
+    @ApiModelProperty("商品采购成本")
+    private Integer purchaseCost;
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelGoodsOrderServiceImpl.java

@@ -200,6 +200,8 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
             channelGoods.setSupplierId(item.getSupplierId());
             channelGoods.setQuantity(item.getGoodsNum());
             channelGoods.setRemainQty(item.getGoodsNum());
+            channelGoods.setPurchasePrice(goods.getPurchasePrice());
+            channelGoods.setPurchaseCost(goods.getPurchaseCost());
             goodsList.add(channelGoods);
         }
         channelGoodsService.saveBatch(goodsList);
@@ -235,6 +237,8 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
                 channelGoods.setSupplierId(item.getSupplierId());
                 channelGoods.setQuantity(item.getGoodsNum());
                 channelGoods.setRemainQty(item.getGoodsNum());
+                channelGoods.setPurchasePrice(goods.getPurchasePrice());
+                channelGoods.setPurchaseCost(goods.getPurchaseCost());
                 goodsList.add(channelGoods);
             }
             channelGoodsService.saveBatch(goodsList);

mp-service/src/main/resources/mapper/channel/ChannelGoodsOrderItemMapper.xml

@@ -24,7 +24,7 @@
     </sql>
     <select id="selectChannelGoodsOrderItemVOList"
             resultType="com.qs.mp.channel.domain.vo.ChannelGoodsOrderItemVO">
-        select t1.*,t2.title
+        select t1.*,t2.title,t2.purchase_price,t2.purchase_cost
         from mp_channel_goods_order_item t1
         left join mp_goods t2 on t1.goods_id = t2.goods_id
         ${ew.customSqlSegment}