From 83fedb01cd816b67085c16caf8b36512102f2856 Mon Sep 17 00:00:00 2001
From: Lenovo <zhuacang@163.com>
Date: Sat, 27 Jul 2024 10:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E7=BA=A6=E4=BB=8A=E6=97=A5=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MeituanServiceImpl.java      | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

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 2bcc145..c0f781b 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
@@ -452,7 +452,16 @@ public class MeituanServiceImpl implements IMeituanService {
                         BusStoreInfo storeInfo1 = busStoreInfoMapper.selectBusStoreInfoList(storeInfo).get(0);
 
                         orderInfo.setStoreName(storeInfo1.getStoreName());
-                        orderInfo.setCompleteTime("2024-"+expectTime);
+
+                        String completeTime = "2024-"+expectTime;
+                        if (completeTime.contains("门店设置")){
+                            completeTime = completeTime.replaceAll("门店设置","");
+                        }
+                        if (completeTime.contains("约今日")){
+                            completeTime = completeTime.replaceAll("约今日 ","");
+                        }
+
+                        orderInfo.setCompleteTime(completeTime);
                         orderInfo.setOrderStatus(statusDesc);
                         orderInfo.setCustomId(userId);
                         orderInfo.setOrderCount(orderCount);
@@ -695,18 +704,18 @@ public class MeituanServiceImpl implements IMeituanService {
                             returnVisitInfo.setOrderCompleteTime(sdf.parse(orderInfo.getCompleteTime()));
                         } catch (ParseException e) {
                             e.printStackTrace();
-                            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;
-                            }
+//                            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;
+//                            }
                         }
                         //returnVisitInfo.setFinishTime(busOrderInfo.getCompleteTime());  todo
 //                        returnVisitInfo.setReturnVisitTime(new Date());