huanglizhi 1 жил өмнө
parent
commit
b22dad99d0

+ 2 - 1
module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -290,7 +291,7 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
 
     private void fillParam(PreOrderModelDTO preOrderModel) {
         if (preOrderModel.getAppointmentType() == 1 ){
-            if (LocalDateTime.now().plusHours(2).isAfter(preOrderModel.getAppointmentTime())){
+            if (LocalDateTime.now().plusHours(2).isAfter(LocalDateTime.parse(preOrderModel.getAppointmentTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))){
                 throw new ServiceException("预约单必须在当前时间完后2小时");
             }
         }

+ 3 - 3
module-erp/src/main/java/com/hys/app/service/kuaidiniao/entity/PreOrderModel.java

@@ -41,9 +41,9 @@ public class PreOrderModel {
     private Integer appointmentType;
 
     @ApiModelProperty(value = "预约上门单必填预约上门时间格式:YYYY-MM-DD  hh:mm:ss说明:当前时间+2小时,10分钟间隔向上取整。")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private LocalDateTime appointmentTime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private String appointmentTime;
 
     @ApiModelProperty(value = "交通方式,默认0:未指定。指定交通方式会产生额外的费用。暂不支持")
     private Integer travelWay = 0;

+ 1 - 0
sql/应用私钥RSA2048-敏感数据,请妥善保管.txt

@@ -0,0 +1 @@
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjRsNI6yggSofwaLTy01jQe5Tp/uT55E+jw95yqqMtx1IrtTscLzaBUETcsYHeH4qy9NWAGgs4FtYDBUBhrNXpK6ipPszFWZ81oYB6pYf53n/fEfgj/DeEpoumIilenpyGCKs9RVbjokXyRHdtbg4gH639msg/WP5Z+Z6VNqjClp3pz7LJIuqbNZL6mc8SwIr/V2MOLN1m4k/t9JIWCC/h2HxC3KeqDmhtVbwjYD7Cpa2ko/EZlvRyQ8QOktlB3wpDCCgypBO+PPOJEHPZaFy8p7b5Wd5a7KuKrr0mk1JlnworOoDXGfm2eEb89xPm4ffF4SeGhP/SAh1O51aE8/7TAgMBAAECggEACCge1WO6C3Ltu5rff0oDo9aop8/uDHXVbK76S+wuXrkYZ8qT+2J4bJlf905+2GPm/+2vRMkISnMJmfkHMFn8Dbv6nwneHPXPOFSrIHVoh5kP9krlhJazB1NyoogOXQW7eA6yz0rJfnG64NF+zd6zofMzM/opitCdVE1eGMI0SBQ9VZUaeeY49Y1I0fMpWmgcY7iwDY9JZoSassA2m8n0ImmN1f4XbLZyRuN8vOnTG+9QrOB5XKtb8mxjJrRJGzb+PyNM5MRj7pgOGVLMK1Eg494/deJ19OZhV/IvELEmT84W4tuTUcK0jc4HUWzyAsvbaTzMWk2fQ9jN7hwTps440QKBgQD5k1CW0ZYvcO45j2feh19amwl8VAdnrmH8GNoIE/ZCGDUaVfCTWSIRdmb/KtZELMneN4PjlGwmCmFQOF7GDNQmpNSY7olqWvZepEGmFFXCzWl8HTzEDn/XNWxryWKk6Hc2rDBUhTx101vK66wFbfs8Q4jlJVdSWkQ/vQrRgG0rTwKBgQCner5InUMB3kHYxl5ALW9bkRon63V0BAjBWfVesIzaNglTQshQJe2DbfV96ru1A3NMXJ10LMEK8Xndd3qebX0/Z6iwQfiD72V9zC99ESFJAZt8r9z/c1aamhrUgFwS6D86yrF9YOBONSrIvPtYTjgJJW+/tpDbzH8ESAw8OvVDPQKBgA672K0esGwakaXKRoqHmWSC9JtnZoyDaft1CCIj84zRWwkz+6DnSTCYudnkkIOz1TMOOfYMhBn20OnoegfdKAUkA/0HUAt8VUEfF1UTrEB02f5ex4CXjoqI996hI/ayVp9eqPfEad5W3Pts0Fn9tTBImGNWwgH1nEPbCDF4EHnXAoGBAIY7g62RlfY2XFJRU5NelyUt3GfoeV/+J8JIxrgZCxuOOdUo7oIGlCJGDH/alo3TcSLgDDbj8+lAd6tAqt+146/g9jwm8/dS9eZotBsqkqIADs5V6ew4Vk5de2mcY6+nw53sfWt/LOiiBmOTzGQPdSwnfDSNL/drJNaapGvV2WQFAoGAX4ok9ttdC9OlzjwWx0x1dKGPxqyePN1qkOPkyDccFdyCON+ECaZQ28XoPOHdkryA0f/idrr0IaFwE5WT25Qx00Ns0YBaOGRQWpaN52wJpIUxrMtVZ4vdgKfLvRcgFSqQ3BjGfDAW5mSsi8YxV/yJlrKC/HEDDuPIKpYsgKMe86E=