商品改造

mec-biz/src/main/java/com/ym/mec/biz/service/SellOrderService.java

@@ -85,7 +85,7 @@ public interface SellOrderService extends BaseService<Integer, SellOrder> {
 
     List<OrderCreate.OrderItem> convertMallOrder(List<SellOrder> sellOrderList);
 
-    void syncSellOrder2Mall(List<SellOrder> sellOrders, StudentPaymentOrder studentPaymentOrder);
+    void syncSellOrder2Mall(List<SellOrder> sellOrders, StudentPaymentOrder studentPaymentOrder,String musicGroupId);
 
     void mallRefundByOrderId(List<SellOrder> sellOrders);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -149,7 +149,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         }
         this.batchInsert(sellOrders);
         //同步销售订单到商城
-        this.syncSellOrder2Mall(sellOrders, studentPaymentOrder);
+        this.syncSellOrder2Mall(sellOrders, studentPaymentOrder,musicGroupId);
     }
 
     @Override
@@ -275,7 +275,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void syncSellOrder2Mall(List<SellOrder> sellOrders, StudentPaymentOrder studentPaymentOrder) {
+    public void syncSellOrder2Mall(List<SellOrder> sellOrders, StudentPaymentOrder studentPaymentOrder,String musicGroupId) {
         List<OrderCreate.OrderItem> orderItems = this.convertMallOrder(sellOrders);
         OrderCreate mallOrder = new OrderCreate();
         mallOrder.setOrderItemList(orderItems);
@@ -308,7 +308,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
 
             // 查询乐团默认收货地址
             MusicGroupShippingAddressQueryInfo queryInfo = new MusicGroupShippingAddressQueryInfo();
-            queryInfo.setMusicGroupId(mallOrder.getOrchestraId());
+            queryInfo.setMusicGroupId(musicGroupId);
             queryInfo.setPage(1);
             queryInfo.setRows(10);
             List<MusicGroupShippingAddress> rows = musicGroupShippingAddressService.queryPage(queryInfo).getRows();
@@ -529,7 +529,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         }
         if (saveFlag && !org.springframework.util.CollectionUtils.isEmpty(sellOrderList)) {
             this.batchInsert(sellOrderList);
-            this.syncSellOrder2Mall(sellOrderList,order);
+            this.syncSellOrder2Mall(sellOrderList,order,musicGroupId);
         }
         return sellOrderList;
     }