调整配送费 保存活动号

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -144,6 +144,7 @@ public class OrderAdapter {
                         .name(OldOrderAccountType.FULL_DISTRIBUTION_FEE.getDesc())
                         .price(deliveryAmount-discountDeliveryAmount)
                         .accountType(QueryOrderAccountType.FULL_DISTRIBUTION_FEE)
+                        .accountId(shoppingCartGoodsDto.getDiscountDeliveryActivityCode())
                         .build();
                 orderAccountDtos.add(createOrderAccountDto);
 
@@ -614,6 +615,7 @@ public class OrderAdapter {
                         .name(OldOrderAccountType.FULL_DISTRIBUTION_FEE.getDesc())
                         .price(deliveryAmount-discountDeliveryAmount)
                         .accountType(QueryOrderAccountType.FULL_DISTRIBUTION_FEE)
+                        .accountId(shoppingCartGoodsDto.getDiscountDeliveryActivityCode())
                         .build();
                 orderAccountDtos.add(createOrderAccountDto);
 

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -89,6 +89,12 @@ public class ShoppingCartGoodsDto {
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 配送费活动号
+     *
+     */
+    private String discountDeliveryActivityCode;
+
     @Data
     public static class CartGoodsDetailDto {
         /**

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

@@ -115,6 +115,12 @@ public class ShoppingCartGoodsDto {
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 配送费活动号
+     *
+     */
+    private String discountDeliveryActivityCode;
+
 
     @Data
     public static class CartGoodsDetailDto {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -119,7 +119,10 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private String deliveryDiscountDesc;
 
-
+    /**
+     * 减免后配送费
+     */
+    private String discountDeliveryActivityCode;
 
 
 }

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

@@ -639,14 +639,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
 
         getNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsDto);
-        /*Long packAmount = shoppingCartGoodsResponseVo.getPackAmount() == null ? 0 : shoppingCartGoodsResponseVo.getPackAmount();
-        shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsDto.getTotalAmount() - packAmount);
-        shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsDto.getOriginalTotalAmount() - packAmount);
-        shoppingCartGoodsDto.setPackageAmount(packAmount);*/
         shoppingCartGoodsDto.setDeliveryAmount(shoppingCartGoodsResponseVo.getDeliveryAmount());
         shoppingCartGoodsDto.setDiscountDeliveryAmount(shoppingCartGoodsResponseVo.getDiscountDeliveryAmount());
         shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());
         shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
+        shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
         return ResponseUtil.success(shoppingCartGoodsDto);
     }
 
@@ -1008,6 +1005,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          */
 
         if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
+
+            List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
+            activityTypeEnums.add(ActivityTypeEnum.TYPE_14);
+
+            ActivityQueryResponseDto activityQueryResponseDto = activityService.queryActivityByType(activityQueryDto, activityTypeEnums, null);
+            ActivityResponseDto activityResponse =null;
+            if (activityQueryResponseDto != null &&activityQueryResponseDto.getResult()!=null && activityQueryResponseDto.getResult().size()>0) {
+                activityResponse = activityQueryResponseDto.getResult().get(0);
+                shoppingCartGoodsResponseVo.setDiscountDeliveryActivityCode(activityResponse.getActivityCode());
+            }
+
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount=null;
             if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
                 Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discountop
@@ -1032,13 +1040,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsResponseVo.setThresholdAmount(discount.getThresholdAmount());
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
             }else{
-                List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
-                activityTypeEnums.add(ActivityTypeEnum.TYPE_14);
 
-                ActivityQueryResponseDto activityQueryResponseDto = activityService.queryActivityByType(activityQueryDto, activityTypeEnums, null);
-                if (activityQueryResponseDto != null &&activityQueryResponseDto.getResult()!=null && activityQueryResponseDto.getResult().size()>0) {
+                if (activityResponse!=null) {
 
-                    ActivityResponseDto activityResponse = activityQueryResponseDto.getResult().get(0);
                     BenefitBeanDto beanDto=activityResponse.getBenefits().get(0);
 
                     if(beanDto.getBenefitType() == 1||beanDto.getDiscountAmount()>=deliveryAmount){