Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

order-application-service/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.2.1.RELEASE</version>
+            <version>3.1.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -190,7 +190,7 @@ public class OrderAdapter {
             }
         }
         createOrderDto.setProducts(products);
-        boolean hasDeliveryMonthCard = false;
+//        boolean hasDeliveryMonthCard = false;
         for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId(activityDiscountsDto.getActivityCode())
@@ -207,9 +207,9 @@ public class OrderAdapter {
                     jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
                 } else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("customerCode", activityDiscountsDto.getTenderId());
-                    if(null != activityDiscountsDto.getExtendType() && activityDiscountsDto.getExtendType() == 2) {
-                        hasDeliveryMonthCard = true;
-                    }
+//                    if(null != activityDiscountsDto.getExtendType() && activityDiscountsDto.getExtendType() == 2) {
+//                        hasDeliveryMonthCard = true;
+//                    }
                 }
                 if(null != activityDiscountsDto.getExtendType()) {
                     jsonObject.put("extendType", activityDiscountsDto.getExtendType());
@@ -228,9 +228,9 @@ public class OrderAdapter {
                     .sequence(orderAccountIndex++)
                     .actualPrice(discountDeliveryAmount)
                     .build();
-            if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) {
-                createOrderAccountDto.setProductId(storeResponseDto.getBenefitCardDiscountAmount()+"00");
-            }
+//            if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) {
+//                createOrderAccountDto.setProductId(storeResponseDto.getBenefitCardDiscountAmount()+"00");
+//            }
             orderAccountDtos.add(createOrderAccountDto);
         }
         if (packageAmount > 0) {