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

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

@@ -133,6 +133,7 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
                 channelGoodsOrderSettleVO.setSettleTime(settleOrder.getPayTime());
             }
         }
+        channelGoodsOrderSettleVO.setOrderId(orderId);
         channelGoodsOrderSettleVO.setTel(channelGoodsOrderVO.getTel());
         channelGoodsOrderSettleVO.setChannelName(channelGoodsOrderVO.getChannelName());
         channelGoodsOrderSettleVO.setItems(channelGoodsList);

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

@@ -471,6 +471,8 @@ public class GoodsMgrController extends BaseApiController {
                 }
                 // 累计库存
                 int totalQuantity = skuList.stream().mapToInt(GoodsSku::getQuantity).sum();
+                goods.setPurchasePrice(firstGoodsSku.getPurchasePrice());
+                goods.setPurchaseCost(firstGoodsSku.getPurchaseCost());
                 goods.setQuantity(totalQuantity);
             }
         }

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

@@ -2,11 +2,13 @@ package com.qs.mp.web.controller.api.channel;
 
 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.channel.domain.ChannelGoodsOrder;
 import com.qs.mp.channel.domain.ChannelGoodsSettleOrder;
 import com.qs.mp.channel.domain.ChannelGoodsSettleOrderItem;
 import com.qs.mp.channel.domain.param.OrderPayParam;
 import com.qs.mp.channel.domain.vo.ChannelGoodsSettleItem;
+import com.qs.mp.channel.domain.vo.ChannelGoodsSettleOrderItemVO;
 import com.qs.mp.channel.domain.vo.ChannelSettleVO;
 import com.qs.mp.channel.service.IChannelGoodsSettleOrderItemService;
 import com.qs.mp.channel.service.IChannelGoodsSettleOrderService;
@@ -85,9 +87,9 @@ public class ChannelGoodsSettleController extends BaseApiController {
         Long channelId = SecurityUtils.getLoginUser().getChannelId();
         ChannelGoodsSettleOrder settleOrder = settleOrderService.getById(orderId);
         ChannelSettleVO channelSettleVO = mapperFacade.map(settleOrder, ChannelSettleVO.class);
-        List<ChannelGoodsSettleOrderItem> items = settleOrderItemService.list(new LambdaQueryWrapper<ChannelGoodsSettleOrderItem>()
-                .eq(ChannelGoodsSettleOrderItem::getChannelId, channelId)
-                .eq(ChannelGoodsSettleOrderItem::getOrderId, orderId));
+        List<ChannelGoodsSettleOrderItemVO> items = settleOrderItemService.listSettleOrderItemVO(new QueryWrapper<ChannelGoodsSettleOrderItem>()
+                .eq("t1.channel_id", channelId)
+                .eq("t1.order_id", orderId));
         channelSettleVO.setItems(items);
         return AjaxResult.success(channelSettleVO);
     }

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

@@ -0,0 +1,18 @@
+package com.qs.mp.channel.domain.vo;
+
+import com.qs.mp.channel.domain.ChannelGoodsSettleOrderItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhangkaikai
+ * @create 2023-06-09 8:54 PM
+ **/
+@Data
+@ApiModel(value = "结算明细")
+public class ChannelGoodsSettleOrderItemVO extends ChannelGoodsSettleOrderItem {
+
+    @ApiModelProperty("商品属性")
+    private String properties;
+}

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

@@ -40,6 +40,6 @@ public class ChannelSettleVO {
     private Date payTime;
 
     @ApiModelProperty("结算订单明细")
-    private List<ChannelGoodsSettleOrderItem> items;
+    private List<ChannelGoodsSettleOrderItemVO> items;
 
 }

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelGoodsSettleOrderItemMapper.java

@@ -1,7 +1,14 @@
 package com.qs.mp.channel.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.channel.domain.ChannelGoodsSettleOrderItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.mp.channel.domain.vo.ChannelGoodsSettleOrderItemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @auther quanshu
@@ -10,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ChannelGoodsSettleOrderItemMapper extends BaseMapper<ChannelGoodsSettleOrderItem> {
 
+    List<ChannelGoodsSettleOrderItemVO> listSettleOrderItemVO(@Param(Constants.WRAPPER) QueryWrapper<ChannelGoodsSettleOrderItem> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelGoodsSettleOrderItemService.java

@@ -1,7 +1,12 @@
 package com.qs.mp.channel.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.channel.domain.ChannelGoodsSettleOrderItem;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.mp.channel.domain.vo.ChannelGoodsSettleOrderItemVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IChannelGoodsSettleOrderItemService extends IService<ChannelGoodsSettleOrderItem> {
 
+    List<ChannelGoodsSettleOrderItemVO> listSettleOrderItemVO(QueryWrapper <ChannelGoodsSettleOrderItem> queryWrapper);
 }

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

@@ -1,11 +1,15 @@
 package com.qs.mp.channel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.channel.domain.ChannelGoodsSettleOrderItem;
+import com.qs.mp.channel.domain.vo.ChannelGoodsSettleOrderItemVO;
 import com.qs.mp.channel.mapper.ChannelGoodsSettleOrderItemMapper;
 import com.qs.mp.channel.service.IChannelGoodsSettleOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 经销商商品结算订单明细 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChannelGoodsSettleOrderItemServiceImpl extends ServiceImpl<ChannelGoodsSettleOrderItemMapper, ChannelGoodsSettleOrderItem> implements IChannelGoodsSettleOrderItemService {
 
+    @Override
+    public List<ChannelGoodsSettleOrderItemVO> listSettleOrderItemVO(QueryWrapper<ChannelGoodsSettleOrderItem> queryWrapper) {
+        return getBaseMapper().listSettleOrderItemVO(queryWrapper);
+    }
 }

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

@@ -23,5 +23,11 @@
     <sql id="Base_Column_List">
         item_id, channel_id, order_id, channel_goods_id, title, pic_url, goods_num, created_time, updated_time, purchase_cost, verify_qty, remain_qty, settle_qty
     </sql>
+    <select id="listSettleOrderItemVO" resultType="com.qs.mp.channel.domain.vo.ChannelGoodsSettleOrderItemVO">
+        select t1.*,t2.properties
+        from mp_channel_goods_settle_order_item t1
+        left join mp_channel_goods t2 on t1.channel_goods_id = t2.id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>