From 3d158137cc134eae9b1d27e748a179e39d60e601 Mon Sep 17 00:00:00 2001
From: ieaii <1069385070@qq.com>
Date: Wed, 23 Oct 2024 00:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-hanhai-vue/src/views/system/HotelOrderList.vue               | 6 ------
 admin-hanhai-vue/src/views/system/RefundOrderList.vue              | 6 ------
 admin-hanhai-vue/src/views/system/ReplaceOrderList.vue             | 6 ------
 admin-hanhai-vue/src/views/system/WashOrderList.vue                | 6 ------
 .../java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java | 2 ++
 .../org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml   | 7 +++++++
 .../org/jeecg/modules/hotelorder/service/IHotelOrderService.java   | 2 ++
 .../modules/hotelorder/service/impl/HotelOrderServiceImpl.java     | 5 +++++
 .../org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java | 5 +++--
 9 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/admin-hanhai-vue/src/views/system/HotelOrderList.vue b/admin-hanhai-vue/src/views/system/HotelOrderList.vue
index fc17eec..a8ddaee 100644
--- a/admin-hanhai-vue/src/views/system/HotelOrderList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelOrderList.vue
@@ -244,12 +244,6 @@
             align:"center",
             dataIndex: 'title'
           },
-          {
-            title:'商品图片',
-            align:"center",
-            dataIndex: 'pic',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
           {
             title:'客户姓名',
             align:"center",
diff --git a/admin-hanhai-vue/src/views/system/RefundOrderList.vue b/admin-hanhai-vue/src/views/system/RefundOrderList.vue
index aa2d7ec..a49dd02 100644
--- a/admin-hanhai-vue/src/views/system/RefundOrderList.vue
+++ b/admin-hanhai-vue/src/views/system/RefundOrderList.vue
@@ -252,12 +252,6 @@
             align:"center",
             dataIndex: 'title'
           },
-          {
-            title:'商品图片',
-            align:"center",
-            dataIndex: 'pic',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
           {
             title:'客户姓名',
             align:"center",
diff --git a/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue b/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue
index 2722b7b..6d663cf 100644
--- a/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue
+++ b/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue
@@ -258,12 +258,6 @@
             align:"center",
             dataIndex: 'title'
           },
-          {
-            title:'商品图片',
-            align:"center",
-            dataIndex: 'pic',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
           {
             title:'客户类型',
             align:"center",
diff --git a/admin-hanhai-vue/src/views/system/WashOrderList.vue b/admin-hanhai-vue/src/views/system/WashOrderList.vue
index 8274b2d..49c75fe 100644
--- a/admin-hanhai-vue/src/views/system/WashOrderList.vue
+++ b/admin-hanhai-vue/src/views/system/WashOrderList.vue
@@ -256,12 +256,6 @@
             align:"center",
             dataIndex: 'title'
           },
-          {
-            title:'商品图片',
-            align:"center",
-            dataIndex: 'pic',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
 
           {
             title:'客户姓名',
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java
index e2de374..998daa8 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java
@@ -22,6 +22,8 @@ public interface HotelOrderMapper extends BaseMapper<HotelOrder> {
 
     HotelOrder getOrderOne2(@Param("id") String id,@Param("userId") String userId);
 
+    HotelOrder getOrderOne3(@Param("id") String id,@Param("userId") String userId);
+
     List<HotelOrder> getOrderPage(@Param("id") String id);
 
     IPage<HotelOrder> getOrderLogPage(Page<HotelOrder> page, @Param("userId") String userId, @Param("type") Integer type, @Param("uid") String uid);
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml
index e7c4eb3..33f259d 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml
@@ -55,6 +55,13 @@
         FROM hotel_order a WHERE a.del_flag = 0 AND (a.shop_id = #{userId} OR a.user_id = #{userId}) AND a.id = #{id}
     </select>
 
+    <select id="getOrderOne3" resultType="org.jeecg.modules.hotelorder.entity.HotelOrder">
+        SELECT a.*,
+               (SELECT item_text from sys_dict_item where dict_id = (select id from sys_dict where dict_code = 'order_status') and item_value = a.status) status_dictText,
+               (SELECT item_text from sys_dict_item where dict_id = (select id from sys_dict where dict_code = 'hotel_order_type') and item_value = a.type) type_dictText
+        FROM hotel_order a WHERE a.del_flag = 0  AND a.id = #{id}
+    </select>
+
     <select id="getOrderOne2" resultType="org.jeecg.modules.hotelorder.entity.HotelOrder">
         SELECT a.*,
                (SELECT item_text from sys_dict_item where dict_id = (select id from sys_dict where dict_code = 'order_status') and item_value = a.status) status_dictText,
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java
index a4e6ad6..c282b15 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java
@@ -19,6 +19,8 @@ public interface IHotelOrderService extends IService<HotelOrder> {
 
     HotelOrder getOrderOne2(String id, String userId);
 
+    HotelOrder getOrderOne3(String id, String userId);
+
     IPage<HotelOrder> getOrderLogPage(Page<HotelOrder> page, String userId, Integer type, String uid);
 
     HotelOrder getOrderByUserIdById(String userId,String id);
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java
index 829ce23..12fdbe8 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java
@@ -29,6 +29,11 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderMapper, HotelOr
         return baseMapper.getOrderOne2(id, userId);
     }
 
+    @Override
+    public HotelOrder getOrderOne3(String id, String userId) {
+        return baseMapper.getOrderOne3(id, userId);
+    }
+
     @Override
     public IPage<HotelOrder> getOrderLogPage(Page<HotelOrder> page, String userId, Integer type, String uid) {
         return baseMapper.getOrderLogPage(page, userId, type, uid);
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
index bf7b80a..4a3edd4 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
@@ -239,7 +239,7 @@ public class OrderServiceImpl implements IOrderService {
     @Override
     public Result<?> orderDetail3(String id, String token) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
-        HotelOrder hotelOrder = hotelOrderService.getOrderOne(id,hanHaiMember.getId());
+        HotelOrder hotelOrder = hotelOrderService.getOrderOne3(id,hanHaiMember.getId());
         List<HotelOrderDetail> hotelOrderDetails = hotelOrderDetailService.lambdaQuery()
                 .eq(HotelOrderDetail::getDelFlag, 0)
                 .eq(HotelOrderDetail::getOrderId, hotelOrder.getId())
@@ -1315,6 +1315,7 @@ public class OrderServiceImpl implements IOrderService {
                 shopOrder.setStatus(1);
                 shopOrder.setOrderLogId(hotelOrderLog.getId());
                 shopOrder.setWashShopFlag(1);
+                hotelOrderDetail1.setId(IdWorker.getIdStr());
                 hotelOrderDetail1.setPic(hotelGoods.getPic());
                 hotelOrderDetail1.setGoodsId(hotelGoods.getId());
                 hotelOrderDetail1.setGoodsName(hotelGoods.getName());
@@ -1331,7 +1332,7 @@ public class OrderServiceImpl implements IOrderService {
                 HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
                 hotelLeaseLog1.setUserId(hotelShop.getUserId());
                 hotelLeaseLog1.setOrderId(shopOrder.getId());
-                hotelLeaseLog1.setOrderDetailId(hotelOrderDetail.getId());
+                hotelLeaseLog1.setOrderDetailId(hotelOrderDetail1.getId());
                 hotelLeaseLog1.setGoodsId(hotelOrderDetail.getGoodsId());
                 hotelLeaseLog1.setSkuId(hotelOrderDetail.getSkuId());
                 hotelLeaseLog1.setGoodsName(hotelOrderDetail.getGoodsName());