fix 随单购

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

@@ -65,6 +65,10 @@ public class ActivityCalculationDiscountRequestDto {
 
     private Long distributionFee;
     /**
+     * 购买月卡费用(分)
+     */
+    private Long payCardFee;
+    /**
      * 是否是会员
      */
     private Boolean isMember;

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

@@ -87,6 +87,20 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private String menuType ;
 
+    /**
+     * 随单购是否购买月享卡
+     * 1:购买，2：不购买
+     */
+    private String buyMonthlyCard;
+    /**
+     * 月享卡卡号
+     */
+    private String monthlyCardCode;
+    /**
+     * 购买月卡费用(分)
+     */
+    private Long payCardFee;
+
     @Data
     public final static class SendGoods {
         /**

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -84,12 +84,13 @@ public class CalculationServiceImpl {
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult updateShoppingCartGoodsDiscount(String partnerId, String storeId, String userId, String appId, Integer orderType,
                                                                                                             boolean isMember, String menuType, String receiveId,String couponCode,
                                                                                                             List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
-                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
+                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,
+                                                                                                            Long payCardFee) {
 
         Long deliveryAmount = calculateDeliveryAmount(receiveId, partnerId, storeId, menuType);
 
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = getCalculationDiscount(partnerId, storeId, userId, appId, orderType, isMember,
-                menuType, deliveryAmount, cartGoodsList, coupons, sendGoodsList);
+                menuType, deliveryAmount, cartGoodsList, coupons, sendGoodsList,payCardFee);
         updateDiscount(calculationDiscount, cartGoodsList, shoppingCartGoodsResponseVo,deliveryAmount);
         //满减
         ActivityQueryDto activityQueryDto = fullPromotionCalculation.getActivityQueryDto(partnerId, storeId, userId, appId, orderType);
@@ -111,7 +112,7 @@ public class CalculationServiceImpl {
 
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getCalculationDiscount(
             String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, String menuType, Long deliveryAmount,
-            List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList) {
+            List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, Long payCardFee) {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         for (CartGoods cartGoods : cartGoodsList) {
@@ -141,6 +142,7 @@ public class CalculationServiceImpl {
         discountRequest.setOrgIds(commonService.getOrgIds(partnerId, storeId));
         discountRequest.setDistributionFee(deliveryAmount);
         discountRequest.setIsMember(isMember);
+        discountRequest.setPayCardFee(payCardFee);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
         try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);