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

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

@@ -493,6 +493,7 @@ public class OrderSdkAdapter {
                     //1=订单,2=订单商品,3=售后单
                     orderCostCreateReq.setBillType(1);
                     orderCostCreateReq.setProductId(accountRequest.getProductId());
+                    orderCostCreateReq.setNote(accountRequest.getNote());
                     orderCostCreateReqs.add(orderCostCreateReq);
                 } else {
                     OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderAccountRequest.java

@@ -40,6 +40,8 @@ public class CreateOrderAccountRequest extends BaseConfig {
      */
     private String addInfo;
 
+    private String note;
+
     private String productId;
 
     private Integer discountQty;

order-application-service/pom.xml

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

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.setNote((Integer.parseInt(storeResponseDto.getBenefitCardDiscountAmount())*100)+"");
+            }
             orderAccountDtos.add(createOrderAccountDto);
         }
         if (packageAmount > 0) {
@@ -1117,10 +1117,10 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
-//            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
-//                responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
-//                        BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
-//            }
+            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
+                responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
+                        BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
+            }
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {

order-application-service/src/main/java/cn/freemud/utils/DateUtils.java

@@ -14,7 +14,7 @@ public class DateUtils {
         if (date == null ){
             return null;
         }
-        String[] week={"(周一)","(周二)","(周三)","(周四)","(周五)","(周六)","(周日)"};
+        String[] week={"(周日)","(周一)","(周二)","(周三)","(周四)","(周五)","(周六)"};
         Calendar calendar =Calendar.getInstance();
         calendar.setTime(date);
         int w = calendar.get(Calendar.DAY_OF_WEEK) -1 ;