Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

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

@@ -89,6 +89,11 @@ public class CalculationSharingDiscountRequestDto {
          * 活动号
          */
         private String activityCode;
+
+        /**
+         * 下标
+         */
+        private Integer useIndex;
     }
 
     @Data

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

@@ -217,6 +217,11 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
          * 活动号
          */
         private String activityCode;
+
+        /**
+         * 顺序
+         */
+        private Integer index;
     }
 
 }

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

@@ -598,18 +598,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupons.add(coupon);
             }
 
-            // 当couponCodes不为空时，需参与价格计算,同时排除单券入参
-            if (shoppingCartInfoRequestVo.getCouponCodes() != null) {
-                shoppingCartInfoRequestVo.getCouponCodes().forEach(cp -> {
-                    if(ObjectUtils.equals(couponCode,cp.getCouponCode())){
-                        return;
-                    }
-                    CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
-                    coupon.setCode(cp.getCouponCode());
-                    coupon.setActivityCode(cp.getCouponCode());
-                    coupons.add(coupon);
-                });
-            }
+            buildCoupons(coupons,shoppingCartInfoRequestVo.getCouponCodes());
 
             List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();
             List<ShoppingCartInfoRequestVo.SendGoods> sendGoods = new ArrayList<>();
@@ -844,17 +833,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupons.add(coupon);
             }
             // 当couponCodes不为空时，需参与价格计算,同时排除单券入参
-            if (shoppingCartInfoRequestVo.getCouponCodes() != null) {
-                shoppingCartInfoRequestVo.getCouponCodes().forEach(cp -> {
-                    if(ObjectUtils.equals(couponCode,cp.getCouponCode())){
-                        return;
-                    }
-                    CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
-                    coupon.setCode(cp.getCouponCode());
-                    coupon.setActivityCode(cp.getCouponCode());
-                    coupons.add(coupon);
-                });
-            }
+            buildCoupons(coupons,shoppingCartInfoRequestVo.getCouponCodes());
+
             CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
                     , partnerId
                     , storeId
@@ -2205,4 +2185,30 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             return false;
         }
     }
+
+    private List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> buildCoupons(List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> oldCoupons, List<ShoppingCartInfoRequestVo.couponCode> coupons){
+
+        for(int i = 0 ; i < oldCoupons.size() ; i++){
+            CalculationSharingDiscountRequestDto.CalculationDiscountCoupon oldCoupon = oldCoupons.get(i);
+            oldCoupon.setUseIndex(i);
+        }
+
+        List<String> codes = oldCoupons.stream().map(CalculationSharingDiscountRequestDto.CalculationDiscountCoupon::getCode).collect(toList());
+
+        if (coupons != null) {
+            for(int x = 0 ; x < coupons.size() ; x++){
+                ShoppingCartInfoRequestVo.couponCode cp  = coupons.get(x);
+                if(codes.contains(cp.getCouponCode())){
+                    continue;
+                }
+                CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
+                coupon.setCode(cp.getCouponCode());
+                coupon.setActivityCode(cp.getCouponCode());
+                coupon.setUseIndex(cp.getIndex() == null ? x + oldCoupons.size():  cp.getIndex() + oldCoupons.size());
+                oldCoupons.add(coupon);
+            }
+        }
+
+        return oldCoupons;
+    }
 }

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

@@ -123,7 +123,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         product.setOriginalAmount(product.getOriginalAmount() - product.getOriginalPrice() * num);
                         product.setQty(newQty);
 
-                        if(gifeProductIds.contains(product.getGoodsId())){
+                        if(gifeProductIds.contains(product.getGoodsId()) || !Objects.equals(newQty,0)){
                             product.setGoodsId(null);
                         }