update

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

@@ -14,6 +14,7 @@ import cn.freemud.enums.InvoiceTypeCodeEnum;
 import cn.freemud.enums.OrderStatus;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.thirdparty.OrderServiceClient;
+import cn.freemud.utils.DateUtils;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
@@ -171,7 +172,7 @@ public class OrderInvoiceAdapter {
         request.setInvoiceNo(invoiceCreateRequest.getInvoiceNo());
         request.setTaxRate(INVOICE_TAXRATE);
         request.setPickUpNo(invoiceData.getCode());
-        request.setEndingDate(DateUtil.convert2String(invoiceData.getEndingDate(),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+        request.setEndingDate(DateUtils.convert2Date(invoiceData.getEndingDate()));
         request.setOrderCodes(orderCodes);
         return request;
     }

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

@@ -18,5 +18,5 @@ public class InvoiceCreateResponse {
     private String code;
 
     @ApiModelProperty(value = "扫码开票截至时间")
-    private Date endingDate;
+    private String endingDate;
 }

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

 package cn.freemud.utils;
 
+import com.freemud.application.sdk.api.log.ErrorLog;
+import org.apache.commons.lang.StringUtils;
+
 import java.util.Calendar;
 import java.util.Date;
 
@@ -24,6 +27,23 @@ public class DateUtils {
         return week[w];
     }
 
+    public static String convert2Date(String date){
+        try {
+            if(StringUtils.isBlank(date)){
+                return null;
+            }
+            date = date.replace("年", "-");
+            date = date.replace("月","-");
+            date = date.replace("日"," ");
+            date = date.replace("时",":");
+            date = date + "00:00";
+            return date;
+        }catch (Exception e){
+            ErrorLog.printErrorLog("时间转换报错，原始时间:{}", date, null,null);
+            return null;
+        }
+    }
+
 
 
 }