恢复代码

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

@@ -183,7 +183,7 @@ public class OrderAdapter {
             }
         }
         createOrderDto.setProducts(products);
-//        boolean hasDeliveryMonthCard = false;
+        boolean hasDeliveryMonthCard = false;
         for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId(activityDiscountsDto.getActivityCode())
@@ -200,9 +200,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());
@@ -221,9 +221,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.setAddInfo((Integer.parseInt(storeResponseDto.getBenefitCardDiscountAmount())*100)+"");
+            }
             orderAccountDtos.add(createOrderAccountDto);
         }
         if (packageAmount > 0) {