修改参数

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -104,7 +104,7 @@ public class ActivityCalculationDiscountResponseDto {
          */
         private Long distributionFee;
 
-        private SendPoint sendPoint;
+        private SendPoint sendPointVo;
 
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -96,6 +96,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private boolean storeDeliveryUseOld;
 
     @Autowired
+
     private ActivityAdapter activityAdapter;
     @Autowired
     private StoreItemClient storeItemClient;
@@ -692,7 +693,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());
         shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
         shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
-        shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPoint());
+        shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPointVo());
         return ResponseUtil.success(shoppingCartGoodsDto);
     }
 
@@ -858,7 +859,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     private void convert2SendPoint(ActivityCalculationDiscountResponseDto.CalculationDiscountResult result, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discountDTO) {
-        SendPoint sendPoint = result.getSendPoint();
+        SendPoint sendPoint = result.getSendPointVo();
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendPointDto sendPointVo = discountDTO.getSendPointVo();
         if (sendPointVo != null){
             sendPoint.setMaxNum(sendPointVo.getMaxNum());