From c7f51537e8c83a1fce3022002c23ee10dafde9f5 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 24 Aug 2023 13:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CanteenDishesServiceImpl.java | 1 +
 .../com/epmet/service/impl/CanteenMenusServiceImpl.java  | 6 ++++++
 .../epmet/service/impl/CommunityCanteenServiceImpl.java  | 9 +++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java
index b5dd6ed0b3..947652debb 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java
@@ -71,6 +71,7 @@ public class CanteenDishesServiceImpl extends BaseServiceImpl<CanteenDishesDao,
         wrapper.eq(StringUtils.isNotEmpty(canteenId), "CANTEEN_ID", canteenId);
         LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails();
         wrapper.likeRight(StringUtils.isNotEmpty(userDetails.getOrgIdPath()), "AGENCY_ID", userDetails.getOrgIdPath());
+        wrapper.orderBy(true,true,"SORT");
         return wrapper;
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java
index 3684c07f53..4d25ce067e 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java
@@ -198,6 +198,12 @@ public class CanteenMenusServiceImpl extends BaseServiceImpl<CanteenMenusDao, Ca
         if (StringUtils.isNotEmpty(dto.getEndTime())) {
             entity.setEndTime(DateUtil.parseDate(dto.getEndTime()));
         }
+        LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails();
+        entity.setAgencyId(userDetails.getOrgIdPath());
+        if (StringUtils.isEmpty(dto.getCanteenId())) {
+            String canteenId = communityCanteenService.getCanteentByAgencyId(userDetails.getOrgIdPath());
+            entity.setCanteenId(canteenId);
+        }
         updateById(entity);
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java
index e73f0a4843..92bbe741b5 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java
@@ -142,10 +142,15 @@ public class CommunityCanteenServiceImpl extends BaseServiceImpl<CommunityCantee
     public void update(CommunityCanteenDTO dto) {
         CommunityCanteenEntity entity = ConvertUtils.sourceToTarget(dto, CommunityCanteenEntity.class);
         if (null != dto.getBusinessHours() && dto.getBusinessHours().length > 0) {
-            entity.setBusinessHours(StringUtils.join(dto.getBusinessHours()));
+            entity.setBusinessHours(StringUtils.join(dto.getBusinessHours(), ","));
         }
         if (null != dto.getThreeMeals() && dto.getThreeMeals().length > 0) {
-            entity.setThreeMeals(StringUtils.join(dto.getThreeMeals()));
+            entity.setThreeMeals(StringUtils.join(dto.getThreeMeals(), ","));
+        }
+        if (StringUtils.isNotEmpty(dto.getAgencyId())) {
+            AgencyInfoCache info = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
+            entity.setAgencyId(PidUtils.convertPid2OrgIdPath(dto.getAgencyId(), info.getPids()));
+            entity.setCustomerId(info.getCustomerId());
         }
         updateById(entity);
     }