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

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

@@ -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 ;