问题修复

e6152da4 · 徐康 · 0b8a62f6 · e6152da4
Commit e6152da4 authored Aug 09, 2021 by 徐康
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+3 -2

No files found.
--- a/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+++ b/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
@@ -261,8 +261,9 @@ public class OrderAdapter {
                    .sequence(orderAccountIndex++)
                    .build();
            if (mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
-                if(activityDiscountsDto.getDiscountAmount() == 0 && activityDiscountsDto.getActivityType() == 38 && activityDiscountsDto.getExtendType() == 12
+                if(activityDiscountsDto.getDiscountAmount() == 0 && ActivityTypeEnum.TYPE_38.getCode().equals(activityDiscountsDto.getActivityType())
-                    && (shoppingCartGoodsDto.getMonthCardDiscount() == null || shoppingCartGoodsDto.getMonthCardDiscount().getDiscountAmount() == 0)) {
+                        && activityDiscountsDto.getExtendType() == 12   //12=月享卡2.0
+                        && (shoppingCartGoodsDto.getMonthCardDiscount() == null || shoppingCartGoodsDto.getMonthCardDiscount().getDiscountAmount() == 0)) {
                    continue;
                }
                JSONObject jsonObject = new JSONObject();