yuhongqi 5 дней назад
Родитель
Сommit
e903a70d41

+ 3 - 2
fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1832,7 +1832,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
         
         if (param.getCityId() != null) {
-            payDelivery = handleDeliveryMoney(param.getCityId(), fsStoreProduct, param.getTotalNum(), fsStoreProductAttrValueForDelivery);
+//            payDelivery = handleDeliveryMoney(param.getCityId(), fsStoreProduct, param.getTotalNum(), fsStoreProductAttrValueForDelivery);
             totalPrice = totalPrice.add(payDelivery);
         }
         return LiveOrderComputeDTO.builder().payPrice(payPrice)
@@ -2703,7 +2703,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 //        }
 //        payPrice = payPrice.add(serviceFee);
         // 生成
-        BigDecimal deliveryMoney = handleDeliveryMoney(liveOrder);
+//        BigDecimal deliveryMoney = handleDeliveryMoney(liveOrder);
+        BigDecimal deliveryMoney = BigDecimal.ZERO;
         totalPrice = totalPrice.add(deliveryMoney);
         liveOrder.setDiscountMoney(totalPrice);