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

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

@@ -282,7 +282,7 @@ public class CouponDiscountCalculation {
             }
             for (int i = index+1; i < cartGoodsList.size(); i++) {
                 CartGoods cartGoods = cartGoodsList.get(i);
-                if(cartGoods.getIsB3S1Coupon() == 1) {
+                if(cartGoods.getIsB3S1CouponGoods() == 1) {
                     cartGoodsList.remove(i);
                     cartGoodsList.add(index, cartGoods);
                     index++;