修改发货

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -98,7 +98,7 @@ public class TradeOrderController {
         // 最终组合
         PageResult<TradeOrderPageItemRespVO> data = TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, userMap);
         for (TradeOrderPageItemRespVO tradeOrderPageItemRespVO : data.getList()) {
-            tradeOrderPageItemRespVO.setSpuType(tradeOrderQueryService.getSpuType(orderItems));
+            tradeOrderPageItemRespVO.setSpuType(tradeOrderQueryService.getSpuTypeByList(tradeOrderPageItemRespVO.getItems()));
         }
         return success(data);
     }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -2,6 +2,7 @@ package cn.newfeifan.mall.module.trade.service.order;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
+import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderSummaryRespVO;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
@@ -213,4 +214,6 @@ public interface TradeOrderQueryService {
      * @return 0 是虚拟商品
      */
     Integer getSpuType(List<TradeOrderItemDO> orderItems);
+
+    Integer getSpuTypeByList(List<TradeOrderPageItemRespVO.Item> items);
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -14,6 +14,7 @@ import cn.newfeifan.mall.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.newfeifan.mall.module.product.service.spu.ProductSpuService;
 import cn.newfeifan.mall.module.system.controller.admin.user.vo.user.UserShopDetailsVO;
 import cn.newfeifan.mall.module.system.service.user.AdminUserService;
+import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderSummaryRespVO;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
@@ -250,6 +251,17 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         return null;
     }
 
+    @Override
+    public Integer getSpuTypeByList(List<TradeOrderPageItemRespVO.Item> items) {
+        for (TradeOrderPageItemRespVO.Item orderItem : items) {
+            ProductSpuDO spu = productSpuService.getSpu(orderItem.getSpuId());
+            if(spu.getSpuType() == 0){
+                return 0;
+            }
+        }
+        return null;
+    }
+
     @Override
     public List<ExpressTrackRespDTO> getExpressTrackList(Long id, Long userId) {
         // 查询订单