券优惠判断调整

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

@@ -99,7 +99,7 @@ public class CouponPromotionService implements IPromotionService {
                     //前端计算小计拿商品现价累计减couponDiscount，商品券换购券现价已排除
                     if(ActivityTypeEnum.TYPE_33.getCode()== couponResults.getActivityType()
                             || ActivityTypeEnum.TYPE_32.getCode()== couponResults.getActivityType()
-                            || ActivityTypeEnum.TYPE_330.getCode()== couponResults.getActivityType()){
+                            || Objects.equals(ActivityTypeEnum.TYPE_330.getCode(), couponResults.getActivityType())){
                         continue;
                     }
                     couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());

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

@@ -308,7 +308,7 @@ public class CouponDiscountCalculation {
                 //前端计算小计拿商品现价累计减couponDiscount，商品券换购券现价已排除
                 if(ActivityTypeEnum.TYPE_33.getCode()== couponResults.getType()
                         || ActivityTypeEnum.TYPE_32.getCode()== couponResults.getType()
-                        || ActivityTypeEnum.TYPE_330.getCode()== couponResults.getType()){
+                        || Objects.equals(ActivityTypeEnum.TYPE_330.getCode(),couponResults.getType())){
                     continue;
                 }
                 couponDiscount = couponDiscount + (couponResults.getDiscount() == null ? 0 : couponResults.getDiscount());