Merge remote-tracking branch 'remotes/origin/feature/20210415-优惠券自动勾选-hujingxuan'

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -350,8 +350,8 @@ public class ActivityAdapter {
         couponAvailableCartInfo.setChannelIdList(orgCodes);
 
         Long totalMealDiscountAmount = 0L;//套餐优惠不算在内
-        Long sendDiscountAmount = 0L;//赠送和换购商品优惠不算在内
-        Long sendRealAmount = 0L;//赠送和换购商品实付不算在内
+//        Long sendDiscountAmount = 0L;//赠送和换购商品优惠不算在内
+//        Long sendRealAmount = 0L;//赠送和换购商品实付不算在内
         if(discountResult!=null){
             //已使用券
             if(CollectionUtils.isNotEmpty(discountResult.getDiscounts())){
@@ -370,8 +370,8 @@ public class ActivityAdapter {
                     //小料和可选搭配金额
                     Pair<Long,Long> pair  = getSmallMaterialAmountSharing(discountGood.getSmallMaterial());//value1=总实付 value2=总优惠
                     if(Objects.equals(CalculationGoodsType.TYPE_1.getType(),discountGood.getCartGoodType()) || Objects.equals(CalculationGoodsType.TYPE_2.getType(),discountGood.getCartGoodType())){
-                        sendRealAmount += discountGood.getRealAmount() + pair.getFirst();
-                        sendDiscountAmount += discountGood.getDiscountAmount() + pair.getSecond();
+//                        sendRealAmount += discountGood.getRealAmount() + pair.getFirst();
+//                        sendDiscountAmount += discountGood.getDiscountAmount() + pair.getSecond();
                         continue;
                     }
                     CartProduct cartProduct = new CartProduct();
@@ -393,9 +393,12 @@ public class ActivityAdapter {
                 }
                 couponAvailableCartInfo.setProductList(goods);
             }
-            couponAvailableCartInfo.setOriginalTotalAmount(discountResult.getOriginalTotalAmount() - totalMealDiscountAmount - sendRealAmount - sendDiscountAmount);
-            couponAvailableCartInfo.setRealAmount(discountResult.getTotalAmount() - sendRealAmount);
-            couponAvailableCartInfo.setDiscountAmount(discountResult.getTotalDiscountAmount() - totalMealDiscountAmount - sendDiscountAmount);
+//            couponAvailableCartInfo.setOriginalTotalAmount(discountResult.getOriginalTotalAmount() - totalMealDiscountAmount - sendRealAmount - sendDiscountAmount);
+//            couponAvailableCartInfo.setRealAmount(discountResult.getTotalAmount() - sendRealAmount);
+//            couponAvailableCartInfo.setDiscountAmount(discountResult.getTotalDiscountAmount() - totalMealDiscountAmount - sendDiscountAmount);
+            couponAvailableCartInfo.setOriginalTotalAmount(discountResult.getOriginalTotalAmount() - totalMealDiscountAmount);
+            couponAvailableCartInfo.setRealAmount(discountResult.getTotalAmount());
+            couponAvailableCartInfo.setDiscountAmount(discountResult.getTotalDiscountAmount() - totalMealDiscountAmount);
         }else{
             couponAvailableCartInfo.setProductList(new ArrayList<>());
             couponAvailableCartInfo.setOriginalTotalAmount(0L);
@@ -411,6 +414,7 @@ public class ActivityAdapter {
         couponAvailableCartInfo.setMerchantId(partnerId);
         couponAvailableCartInfo.setStoreId(storeId);
         couponAvailableCartInfo.setChannelIdList(orgCodes);
+        couponAvailableCartInfo.setExclusion(true);
 
         Long totalMealDiscountAmount = 0L;//套餐优惠不算在内
         if(discountResult!=null){

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

@@ -44,4 +44,7 @@ public class CouponAvailableCartInfo {
 
     //购物车商品列表
     private List<CartProduct> productList;
+
+    //由于老的算价接口优惠券和活动直接就是互斥的,因此不需要依赖券里面的配置
+    private  boolean exclusion = false;
 }