diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index e343e62..de1176c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -7,12 +7,12 @@ ruoyi: # 版权年份 copyrightYear: 2024 # 文件路径 示例( Windows配置 F:/home/youshi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: F:/home/youshi/uploadPath + profile: /home/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 captchaType: math - # 根路径地址 + # 根路径地址 https://youshi.bj.cn/prod-api http://localhost/dev-api baseUrl: https://youshi.bj.cn/prod-api # 开发环境配置 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index 5a19265..2bcc145 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -695,8 +695,15 @@ public class MeituanServiceImpl implements IMeituanService { returnVisitInfo.setOrderCompleteTime(sdf.parse(orderInfo.getCompleteTime())); } catch (ParseException e) { e.printStackTrace(); - if("门店设置".equals(orderInfo.getCompleteTime())){ + if(orderInfo.getCompleteTime().contains("门店设置")){//"2024-门店设置07-27 02:37" // TODO: 2024-07-27 + String completeTime = orderInfo.getCompleteTime().substring(0,5)+orderInfo.getCompleteTime().substring(9); + try { + returnVisitInfo.setOrderCompleteTime(sdf.parse(completeTime)); + } catch (ParseException ex) { + ex.printStackTrace(); + continue; + } }else{ continue; }