Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

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

@@ -261,6 +261,25 @@ public class CouponDiscountCalculation {
                 cartGoodsList.clear();
                 cartGoodsList.addAll(nowCartGoodsList);
             }
+
+            int index = 0;
+            for (int i = 0; i < cartGoodsList.size(); i++) {
+                if(cartGoodsList.get(i).getIsB3S1Coupon() == 1) {
+                    index++;
+                } else {
+                    break;
+                }
+            }
+            for (int i = index+1; i < cartGoodsList.size(); i++) {
+                CartGoods cartGoods = cartGoodsList.get(i);
+                if(cartGoods.getIsB3S1Coupon() == 1) {
+                    continue;
+                } else {
+                    cartGoodsList.remove(i);
+                    cartGoodsList.add(index, cartGoods);
+                    index++;
+                }
+            }
         }
 
         // 当couponCode不为空时，需计算优惠价格