From da43f72bc5c4ed224aa68ba0d0a294afe0a5af76 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 12 Jan 2024 17:34:35 +0800
Subject: [PATCH] 1/12

---
 .../biz/customerstore/CustomerStoreMapper.xml |  2 +-
 .../yxt/yyth/biz/empcard/EmpCardService.java  | 30 +++++++++----------
 .../EmpReserveOrderGoodsService.java          |  4 +--
 .../LpkReserveOrderGoodsService.java          |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml b/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml
index 9ea1b77..ff12253 100644
--- a/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
 
     <select id="getStoreBySid" resultType="com.yxt.yyth.api.customerstore.CustomerStoreVo">
-        select s.name ,s.phone,t.name as storeName,t.address ,t.businessHours  from customer_store s left join lpk_store t on s.storeSid=t.sid
+        select s.storeSid, s.name ,s.phone,t.name as storeName,t.address ,t.businessHours  from customer_store s left join lpk_store t on s.storeSid=t.sid
         where customerSid=#{customerSid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
index ceda077..a040e7e 100644
--- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
@@ -451,22 +451,22 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
                 }
             }
         }
-//        CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
-//        if(null!=customerStoreVo){
-//            vo.setAddressName(customerStoreVo.getStoreName());
-//            vo.setValue(customerStoreVo.getStoreSid());
-//            vo.setCustomerName(customerStoreVo.getName());
-//            vo.setCPhone(customerStoreVo.getPhone());
-//        }
-        //上次取货点
-        LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
-        if (null != vo1) {
-            LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
-            if (null != vo2) {
-                vo.setAddressName(vo2.getName());
-                vo.setValue(vo2.getSid());
-            }
+        CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
+        if(null!=customerStoreVo){
+            vo.setAddressName(customerStoreVo.getStoreName());
+            vo.setValue(customerStoreVo.getStoreSid());
+            vo.setCustomerName(customerStoreVo.getName());
+            vo.setCPhone(customerStoreVo.getPhone());
         }
+        //上次取货点
+//        LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
+//        if (null != vo1) {
+//            LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
+//            if (null != vo2) {
+//                vo.setAddressName(vo2.getName());
+//                vo.setValue(vo2.getSid());
+//            }
+//        }
         vo.setPName("企业菜窖");
         vo.setOrderCardVoList(empReserveOrderCardVos);
         return rb.success().setData(vo);
diff --git a/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java b/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java
index 1a0f22d..27fc8f1 100644
--- a/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java
+++ b/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java
@@ -104,7 +104,7 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService<EmpReserveOr
         dto1.setCustomerSid(dto.getCustomerSid());
         dto1.setName(dto.getUserName());
         dto1.setPhone(dto.getUserPhone());
-        dto1.setStoreSid(dto.getStoreSid());
+        dto1.setStoreSid(dto.getValue());
         customerStoreService.saveStore(dto1);
         return rb.success().setData("预约成功");
     }
@@ -160,7 +160,7 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService<EmpReserveOr
         dto1.setCustomerSid(dto.getCustomerSid());
         dto1.setName(dto.getUserName());
         dto1.setPhone(dto.getUserPhone());
-        dto1.setStoreSid(dto.getStoreSid());
+        dto1.setStoreSid(dto.getValue());
         customerStoreService.saveStore(dto1);
         return rb.success().setData("预约成功");
     }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java
index addc65b..c04d154 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java
@@ -87,7 +87,7 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService<LpkReserveOr
         dto1.setCustomerSid(dto.getCustomerSid());
         dto1.setName(dto.getUserName());
         dto1.setPhone(dto.getUserPhone());
-        dto1.setStoreSid(dto.getStoreSid());
+        dto1.setStoreSid(dto.getValue());
         customerStoreService.saveStore(dto1);
         return rb.success().setData("预约成功");
     }