Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

order-application-service/src/main/java/cn/freemud/service/impl/ActivityCalculationDiscountService.java

@@ -21,8 +21,6 @@ import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,8 +44,6 @@ import java.util.Objects;
 @Service
 public class ActivityCalculationDiscountService {
 
-    private static Logger logger = LoggerFactory.getLogger(ActivityCalculationDiscountService.class);
-
     private final static String RESPONSE_SUCCESS_STR = "100";
 
     @Autowired
@@ -90,7 +86,6 @@ public class ActivityCalculationDiscountService {
                 .build();
 
         CalculationDiscountResultDto calculationDiscountResultDto = getCalculationResult(request, coupons);
-        logger.info("促销分摊:{}",calculationDiscountResultDto);
         // 默认计算
         defaultPromotionService.updateDiscountApportion(shoppingCartGoodsResponse, request, calculationDiscountResultDto, couponPromotionDto, activityQueryDto, isApportion);
         // 套餐计算
@@ -101,7 +96,6 @@ public class ActivityCalculationDiscountService {
         fullPromotionService.updateDiscountApportion(shoppingCartGoodsResponse, request, calculationDiscountResultDto, couponPromotionDto, activityQueryDto, isApportion);
         // 限时特价
         timeSalePromotionService.updateDiscountApportion(shoppingCartGoodsResponse, request, calculationDiscountResultDto, couponPromotionDto, activityQueryDto, isApportion);
-        logger.info("限时特价shoppingCartGoodsResponse:{}",shoppingCartGoodsResponse);
         // 积分抵扣
         customerScoreService.updateDiscountApportion(shoppingCartGoodsResponse, request, calculationDiscountResultDto, couponPromotionDto, activityQueryDto, isApportion);
         return shoppingCartGoodsResponse;
@@ -135,9 +129,9 @@ public class ActivityCalculationDiscountService {
         // 2.调用促销计算接口，结算促销结果
         CalculationDiscountResponseDto calculationDiscountResponseDto = null;
         try {
-            calculationDiscountResponseDto = promotionDiscountClient.discountSharing(activityCalculationDiscountRequestDto);
+            calculationDiscountResponseDto = promotionDiscountClient.calculationDiscount(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
-            ErrorLog.printErrorLog("promotionCalculationDiscountError", "/calculation/discount/sharing", activityCalculationDiscountRequestDto, ex);
+            ErrorLog.printErrorLog("promotionCalculationDiscountError", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
             return null;
         }
         if (calculationDiscountResponseDto == null || !StringUtils.equals(calculationDiscountResponseDto.getStatusCode(), RESPONSE_SUCCESS_STR)) {

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java

@@ -32,4 +32,10 @@ public interface PromotionDiscountClient {
     @PostMapping("/activity/query")
     ActivityQueryResponseDto query(ActivityQueryRequestDto activityQueryRequestDto);
 
+    /**
+     * 优惠金额计算
+     */
+    @PostMapping("/calculation/discount")
+    CalculationDiscountResponseDto calculationDiscount(CalculationDiscountRequestDto calculationDiscountRequestDto);
+
 }

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

@@ -406,6 +406,14 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
     }
 
     private void buildActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, ShoppingCartGoodsMealResponseVo shoppingCartGoodsResponseVo) {
+
+        ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, orderType);
+        // 封装满减优惠规则信息
+        FullPromotionService fullPromotionService = (FullPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.FULL_REDUCTION);
+        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVos  =new ShoppingCartGoodsResponseVo();
+        fullPromotionService.updateShoppingCartGoodsDiscount(null, activityQueryDto, null, null, shoppingCartGoodsResponseVos, null, null);
+        shoppingCartGoodsResponseVo.setActivityTip(shoppingCartGoodsResponseVos.getActivityTip());
+
         if(CollectionUtils.isEmpty(shoppingCartGoodsResponseVo.getCartList())) {
             return;
         }
@@ -419,13 +427,6 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         }
         // 限时特价
         timeSalePromotionForWcService.updateShoppingCartGoodsDiscount(calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo);
-
-        ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, orderType);
-        // 封装满减优惠规则信息
-        FullPromotionService fullPromotionService = (FullPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.FULL_REDUCTION);
-        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVos  =new ShoppingCartGoodsResponseVo();
-        fullPromotionService.updateShoppingCartGoodsDiscount(null, activityQueryDto, null, cartGoodsList, shoppingCartGoodsResponseVos, null, null);
-        shoppingCartGoodsResponseVo.setActivityTip(shoppingCartGoodsResponseVos.getActivityTip());
     }
 
     /**