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

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

@@ -125,11 +125,10 @@ public class ChannelGoodsOrderController extends BaseApiController {
                         .orderByDesc(ChannelGoodsOrder::getCreatedTime));
         List<ChannelGoodsOrderVO> channelGoodsOrderVOList = mapperFacade.mapAsList(channelGoodsOrders, ChannelGoodsOrderVO.class);
         for (ChannelGoodsOrderVO channelGoodsOrderVO : channelGoodsOrderVOList) {
-            List<ChannelGoodsOrderItem> itemList = channelGoodsOrderItemService.list(new LambdaQueryWrapper<ChannelGoodsOrderItem>()
-                    .eq(ChannelGoodsOrderItem::getOrderId, channelGoodsOrderVO.getOrderId()));
-
-            List<ChannelGoodsOrderItemVO> itemVOList = mapperFacade.mapAsList(itemList, ChannelGoodsOrderItemVO.class);
-            channelGoodsOrderVO.setItems(itemVOList);
+            QueryWrapper<ChannelGoodsOrderItem> goodsOrderItemQueryWrapper = new QueryWrapper<>();
+            goodsOrderItemQueryWrapper.eq("t1.order_id", channelGoodsOrderVO.getOrderId());
+            List<ChannelGoodsOrderItemVO> goodsOrderItem = channelGoodsOrderItemService.selectChannelGoodsOrderItemVOList(goodsOrderItemQueryWrapper);
+            channelGoodsOrderVO.setItems(goodsOrderItem);
         }
         TableDataInfo rspData = getDataTable(channelGoodsOrders);
         rspData.setRows(channelGoodsOrderVOList);

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

@@ -5,6 +5,7 @@ import com.qs.mp.channel.domain.ChannelGoodsOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.mp.channel.domain.vo.ChannelGoodsOrderSettleVO;
 import com.qs.mp.channel.domain.vo.ChannelGoodsOrderVO;
+import com.qs.mp.channel.domain.vo.ChannelGoodsSettleVO;
 import com.qs.mp.pay.domain.PayOrder;
 
 import java.util.List;
@@ -67,4 +68,6 @@ public interface IChannelGoodsOrderService extends IService<ChannelGoodsOrder> {
      * @return
      */
     int selectChannelGoodsOrderCount(QueryWrapper<ChannelGoodsOrder> queryWrapper);
+
+    List<ChannelGoodsSettleVO> selectChannelGoodsSettleList(QueryWrapper<ChannelGoodsOrder> queryWrapper);
 }

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

@@ -13,6 +13,7 @@ import com.qs.mp.channel.domain.ChannelGoodsOrder;
 import com.qs.mp.channel.domain.ChannelGoodsOrderItem;
 import com.qs.mp.channel.domain.vo.ChannelGoodsOrderSettleVO;
 import com.qs.mp.channel.domain.vo.ChannelGoodsOrderVO;
+import com.qs.mp.channel.domain.vo.ChannelGoodsSettleVO;
 import com.qs.mp.channel.mapper.ChannelGoodsOrderMapper;
 import com.qs.mp.channel.service.IChannelGoodsOrderItemService;
 import com.qs.mp.channel.service.IChannelGoodsOrderService;
@@ -255,4 +256,9 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
         return getBaseMapper().selectChannelGoodsOrderCount(queryWrapper);
     }
 
+    @Override
+    public List<ChannelGoodsSettleVO> selectChannelGoodsSettleList(QueryWrapper<ChannelGoodsOrder> queryWrapper) {
+        return null;
+    }
+
 }