Merge remote-tracking branch 'origin/zx_saas_goods' into feature/zx_saas_goods

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

@@ -787,7 +787,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 sellOrder.setNum(1);
                 sellOrder.setGoodsName(productDto.getName());
                 sellOrder.setAccountType(accountType);
-                sellOrder.setSellCost(goodsSub.getGoodsPrice());
+                sellOrder.setOrganSellCost(goodsSub.getGoodsPrice());
                 sellOrder.setOrganId(order.getOrganId());
                 sellOrder.setCooperationOrganId(musicGroup.getCooperationOrganId());
                 sellOrder.setEduTeacherId(musicGroup.getEducationalTeacherId());

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

@@ -2213,7 +2213,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (CollectionUtils.isEmpty(sellOrders)) {
             throw new BizException("订单不存在");
         }
-        sellOrders = sellOrders.stream().filter(e -> e.getOrganSellCost() == null).collect(Collectors.toList());
+        sellOrders = sellOrders.stream().filter(e -> e.getDeliveryTime() == null).collect(Collectors.toList());
         if(CollectionUtils.isEmpty(sellOrders)){
             return;
         }
@@ -2251,7 +2251,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 if(costPrice == null){
                     throw new BizException("商品[{}]成本价不存在",sellOrder.getGoodsSkuId());
                 }
-                sellOrder.setOrganSellCost(costPrice);
+                sellOrder.setSellCost(costPrice);
                 sellOrder.setDeliveryTime(format);
             }
         }