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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2829,6 +2829,7 @@ public class OrderSdkAdapter {
                 orderSettlementCreateReq.setIsOnline(true);
                 orderSettlementCreateReq.setSettlementType(getDiscountType(accountRequest.getAccountType()));
                 orderSettlementCreateReq.setNote(accountRequest.getName());
+                orderSettlementCreateReq.setExtInfo(accountRequest.getAddInfo());
                 orderSettlementCreateReqList.add(orderSettlementCreateReq);
             }
 

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

@@ -190,11 +190,15 @@ public class OrderAdapter {
             if(mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
                 JSONObject jsonObject = new JSONObject();
                 if(ActivityTypeEnum.TYPE_11.getCode().equals(activityDiscountsDto.getActivityType())
-                        || ActivityTypeEnum.TYPE_12.getCode().equals(activityDiscountsDto.getActivityType())) {
+                        || ActivityTypeEnum.TYPE_12.getCode().equals(activityDiscountsDto.getActivityType())
+                        || ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
                 } else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("customerCode", activityDiscountsDto.getTenderId());
                 }
+                if(null != activityDiscountsDto.getExtendType()) {
+                    jsonObject.put("extendType", activityDiscountsDto.getExtendType());
+                }
                 createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
             }
             orderAccountDtos.add(createOrderAccountDto);
@@ -370,6 +374,14 @@ public class OrderAdapter {
                     .discountQty((activityDiscountsDto.getActualActivityGoodsNumber()==null||activityDiscountsDto.getActualActivityGoodsNumber()==0)
                             ?createOrderProductDto.getNumber():activityDiscountsDto.getActualActivityGoodsNumber())
                     .build();
+            JSONObject jsonObject = new JSONObject();
+            if(ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())) {
+                jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
+            }
+            if(null != activityDiscountsDto.getExtendType()) {
+                jsonObject.put("extendType", activityDiscountsDto.getExtendType());
+            }
+            createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
             orderAccountDtos.add(createOrderAccountDto);
         }
         return orderAccountDtos;

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ActivityDiscountsDto.java

@@ -23,4 +23,8 @@ public class ActivityDiscountsDto {
     private Integer activityType;
     private Integer actualActivityGoodsNumber;
     private String tenderId;
+    /**
+     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+     */
+    private Integer extendType;
 }