Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/ApprovalCallBackDTO.java

@@ -28,7 +28,7 @@ public class ApprovalCallBackDTO implements Serializable {
     private Integer enterpriseId;
     private String errorCode;
     private String errorCodeRes;
-    @NotNull(message = "审批时间不能为空, 格式为YYYYMMdd", groups = ApprovalValid.class)
+    @NotNull(message = "审批时间不能为空, 格式为yyyyMMdd", groups = ApprovalValid.class)
     private String timeEnd;
     private String prepayId;
 

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/OutPayDTO.java

@@ -62,7 +62,7 @@ public class OutPayDTO implements Serializable {
     @NotNull(message = "购买类型不能为空", groups = {SavePrePay.class, ConfirmPay.class})
     private Integer buyProductType;
     /**
-     * 交易开始时间， 格式为YYYYMMddHHmmss
+     * 交易开始时间， 格式为yyyyMMddHHmmss
      */
     @NotBlank(message = "交易起始时间不能为空", groups = {SavePrePay.class})
     private String timeStart;

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingOrderApiServcImpl.java

 package com.gic.enterprise.service.outer.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
@@ -29,6 +17,17 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.*;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
 import com.github.pagehelper.PageHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 @Service("billingOrderApiService")
 public class BillingOrderApiServcImpl implements BillingOrderApiService {
@@ -114,7 +113,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
             }
         }
         outPayDTO.setBuyType(BuyTypeEnum.BUY_SHORT_MESSAGE_PACKAGE.getCode());
-        outPayDTO.setTimeStart(new SimpleDateFormat("YYYYMMddHHmmss").format(new Date()));
+        outPayDTO.setTimeStart(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
         outPayDTO.setOrderSerialNumber(order.getSerialNumber());
         outPayDTO.setPayType(payType);
         outPayDTO.setAuthCode(authCode);