Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

74973767 · 徐康 · c651cc80 · cf14831f · 74973767
Commit 74973767 authored Sep 18, 2020 by 徐康
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

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

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
@@ -189,7 +189,8 @@ public class OrderAdapter {
                    .sequence(orderAccountIndex++)
                    .build();
            if(mcCafePartnerId.equals(createOrderDto.getCompanyId())
-                    && ActivityTypeEnum.TYPE_1.getCode().equals(activityDiscountsDto.getActivityType())) {
+                    && (ActivityTypeEnum.TYPE_11.getCode().equals(activityDiscountsDto.getActivityType())
+                        || ActivityTypeEnum.TYPE_12.getCode().equals(activityDiscountsDto.getActivityType()))) {
                JSONObject jsonObject = new JSONObject();
                jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
                createOrderAccountDto.setAddInfo(jsonObject.toJSONString());