From 38c3894f43398aefeb18b1a8ba9f34ccac697917 Mon Sep 17 00:00:00 2001
From: ieaii <1069385070@qq.com>
Date: Wed, 20 Nov 2024 20:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E6=96=B0?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-hanhai-vue/.env.development                  |   2 +-
 .../src/views/system/HotelConfList.vue             |   6 +-
 .../src/views/system/modules/HotelConfForm.vue     |   2 +-
 .../src/views/system/modules/HotelGoodsSkuForm.vue |   4 +-
 .../hotelleaselog/mapper/HotelLeaseLogMapper.java  |  13 ++
 .../mapper/xml/HotelLeaseLogMapper.xml             |   4 +-
 .../service/IHotelLeaseLogService.java             |   9 ++
 .../service/impl/HotelLeaseLogServiceImpl.java     |   7 ++
 .../modules/hotelorder/entity/HotelOrder.java      |   9 +-
 .../hotelorder/mapper/HotelOrderMapper.java        |   2 +
 .../hotelorder/mapper/xml/HotelOrderMapper.xml     |   9 +-
 .../hotelorder/service/IHotelOrderService.java     |   2 +
 .../service/impl/HotelOrderServiceImpl.java        |   5 +
 .../xcx/order/controller/OrderController.java      |  27 ++++
 .../xcx/order/req/ConfirmAcceptOrderReq.java       |   3 +
 .../modules/xcx/order/req/ShopReceiptOrderReq.java |  12 ++
 .../modules/xcx/order/service/IOrderService.java   |  29 +++++
 .../xcx/order/service/impl/OrderServiceImpl.java   | 138 ++++++++++++++++++---
 .../xcx/user/controller/UserController.java        |   6 +
 .../modules/xcx/user/service/IUserService.java     |   7 ++
 .../xcx/user/service/impl/UserServiceImpl.java     |   8 ++
 21 files changed, 280 insertions(+), 24 deletions(-)
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ShopReceiptOrderReq.java

diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development
index 25102ca..a82a3d9 100644
--- a/admin-hanhai-vue/.env.development
+++ b/admin-hanhai-vue/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://127.0.0.1:8081/hotel
+VUE_APP_API_BASE_URL=https://hotel.java996.icu/hotel
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 
diff --git a/admin-hanhai-vue/src/views/system/HotelConfList.vue b/admin-hanhai-vue/src/views/system/HotelConfList.vue
index 8400e10..b0d255c 100644
--- a/admin-hanhai-vue/src/views/system/HotelConfList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelConfList.vue
@@ -56,6 +56,9 @@
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
+        <template slot="textSlot" slot-scope="text">
+          <j-ellipsis :value="text"></j-ellipsis>
+        </template>
         <template slot="imgSlot" slot-scope="text,record">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
           <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
@@ -135,7 +138,8 @@
           {
             title:'值',
             align:"center",
-            dataIndex: 'value'
+            dataIndex: 'value',
+            scopedSlots: {customRender: 'textSlot'}
           },
           {
             title:'说明',
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelConfForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelConfForm.vue
index 5d1d28e..e27a713 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelConfForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelConfForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
-              <a-input v-model="model.value" placeholder="请输入值"  ></a-input>
+              <a-textarea v-model="model.value" placeholder="请输入值"  ></a-textarea>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelGoodsSkuForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelGoodsSkuForm.vue
index 1b8fb3c..72b0e65 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelGoodsSkuForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelGoodsSkuForm.vue
@@ -24,8 +24,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="租金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            <a-form-model-item label="押金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入押金" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java
index 277d2e7..73e79af 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java
@@ -1,10 +1,12 @@
 package org.jeecg.modules.hotelleaselog.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -24,4 +26,15 @@ public interface HotelLeaseLogMapper extends BaseMapper<HotelLeaseLog> {
      */
     IPage<HotelLeaseLog> myLeaseLogPage(Page<HotelLeaseLog> page,@Param("userId") String userId,@Param("leaseFlag") Integer leaseFlag,@Param("status") Integer status);
 
+    /**
+     * 获取所有水洗租金
+     * @param userId
+     * @return
+     */
+    @Select("SELECT SUM(IFNULL((SELECT `value` FROM hotel_conf WHERE `name` = 'depositPrice')*a.num*IFNULL(DATEDIFF(NOW(),a.start_time),0),0)) price\n" +
+            "FROM hotel_lease_log a LEFT JOIN hotel_goods_sku b\n" +
+            "    ON a.sku_id = b.id WHERE a.del_flag = 0 AND a.user_id = #{userId} AND a.lease_flag = 1\n" +
+            "AND a.status = 0 AND a.start_time IS NOT NULL;")
+    BigDecimal getAllDepositPrice(@Param("userId") String userId);
+
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml
index 84413a1..8da2c7f 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml
@@ -5,7 +5,7 @@
 
     <select id="myLeaseLogPage" resultType="org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog">
         SELECT a.*,
-               (IFNULL(IFNULL(DATEDIFF(NOW(), a.start_time),0)*(SELECT price FROM hotel_goods_sku WHERE id = a.sku_id )*a.num,0)) zujin,
+               (IFNULL(IFNULL(DATEDIFF(NOW(), a.start_time),0)*(SELECT `value` FROM hotel_conf WHERE `name` = 'depositPrice' )*a.num,0)) zujin,
                (a.num*(SELECT price FROM hotel_category WHERE id = a.category_id)) wash_price,
                (SELECT price FROM hotel_category WHERE id = a.category_id) wash_unit_price,
                (select id from hotel_order where lease_id = a.id and status in (4,5,6,16)) is_wash
@@ -19,4 +19,6 @@
         ORDER BY a.create_time;
     </select>
 
+
+
 </mapper>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java
index ea8173c..f79abb0 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java
@@ -3,9 +3,12 @@ package org.jeecg.modules.hotelleaselog.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.math.BigDecimal;
+
 /**
  * @Description: hotel_lease_log
  * @Author: jeecg-boot
@@ -22,4 +25,10 @@ public interface IHotelLeaseLogService extends IService<HotelLeaseLog> {
      */
     IPage<HotelLeaseLog> myLeaseLogPage(Page<HotelLeaseLog> page, String userId,Integer leaseFlag,Integer status);
 
+    /**
+     * 获取所有水洗租金
+     * @param userId
+     * @return
+     */
+    BigDecimal getAllDepositPrice(String userId);
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java
index ddcc9fa..e4145b6 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java
@@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.math.BigDecimal;
+
 /**
  * @Description: hotel_lease_log
  * @Author: jeecg-boot
@@ -22,4 +24,9 @@ public class HotelLeaseLogServiceImpl extends ServiceImpl<HotelLeaseLogMapper, H
     public IPage<HotelLeaseLog> myLeaseLogPage(Page<HotelLeaseLog> page, String userId,Integer leaseFlag,Integer status) {
         return baseMapper.myLeaseLogPage(page, userId,leaseFlag,status);
     }
+
+    @Override
+    public BigDecimal getAllDepositPrice(String userId) {
+        return baseMapper.getAllDepositPrice(userId);
+    }
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java
index dcf784f..be2610a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java
@@ -93,7 +93,8 @@ public class HotelOrder implements Serializable {
 	 * 状态
 	 * 租赁订单：0待支付 1待发货 2待收货
 	 * 水洗订单：3待支付 4待接单 5待检查
-	 * 6待清洗
+	 * 6待清洗 20 酒店待发货 21水洗店待收货
+	 * 22 水洗店待发货 23 酒店待收货
 	 * 换货订单：7待回收 8待发货 9平台待收货
 	 * 10平台检查损失待用户支付 17待接单
 	 * 退货订单：11待回收 12待发货 13平台待收货
@@ -103,7 +104,8 @@ public class HotelOrder implements Serializable {
 	@Excel(name = "状态 \n" +
 			"租赁订单：0待支付 1待发货 2待收货  \n" +
 			"水洗订单：3待支付 4水洗店接单 5水洗店检查\n" +
-			"6开始清洗 16待接单\n" +
+			"6开始清洗 16待接单 20 酒店待发货 21水洗店待收货 \n" +
+			"22 水洗店待发货 23 酒店待收货\n" +
 			"换货订单：7待回收 8待发货 9平台待收货\n" +
 			"10平台检查损失待用户支付 17待接单\n" +
 			"退货订单：11待回收 12待发货 13平台待收货\n" +
@@ -196,5 +198,8 @@ public class HotelOrder implements Serializable {
 	/**是否为租赁水布 0否 1是*/
 	@Dict(dicCode = "is_delete")
 	private Integer leaseFlag;
+	/**水洗店佣金*/
+	@TableField(exist = false)
+	private BigDecimal shopCoin;
 
 }
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 998daa8..c586735 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
@@ -28,6 +28,8 @@ public interface HotelOrderMapper extends BaseMapper<HotelOrder> {
 
     IPage<HotelOrder> getOrderLogPage(Page<HotelOrder> page, @Param("userId") String userId, @Param("type") Integer type, @Param("uid") String uid);
 
+    IPage<HotelOrder> getShopWashOrderPage(Page<HotelOrder> page, @Param("userId") String userId);
+
     HotelOrder getOrderByUserIdById(@Param("userId") String userId,@Param("id") String id);
 
 
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 33f259d..5c4eb19 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
@@ -75,7 +75,7 @@
 
 
     <select id="getOrderLogPage" resultMap="orderReq">
-        SELECT a.* FROM hotel_order a WHERE a.del_flag = 0
+        SELECT a.*,IFNULL(round((a.order_pay-(a.order_pay*(SELECT `value` FROM hotel_conf WHERE `name` = 'platformServiceRate'))),2),0) shop_coin FROM hotel_order a WHERE a.del_flag = 0
         <if test="type != null">
             AND a.type = #{type}
         </if>
@@ -88,6 +88,13 @@
         order by a.create_time desc
     </select>
 
+    <select id="getShopWashOrderPage" resultMap="orderReq">
+        SELECT a.*, FROM hotel_order a WHERE a.del_flag = 0
+            AND a.type = 1
+            AND  a.shop_id = #{userId}
+        order by a.create_time desc
+    </select>
+
     <select id="getOrderByUserIdById" resultMap="orderOneReq">
         SELECT * FROM hotel_order WHERE del_flag = 0
         <if test="userId != null">
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 c282b15..21c73ef 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
@@ -23,5 +23,7 @@ public interface IHotelOrderService extends IService<HotelOrder> {
 
     IPage<HotelOrder> getOrderLogPage(Page<HotelOrder> page, String userId, Integer type, String uid);
 
+    IPage<HotelOrder> getShopWashOrderPage(Page<HotelOrder> page, String userId);
+
     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 12fdbe8..095514a 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
@@ -39,6 +39,11 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderMapper, HotelOr
         return baseMapper.getOrderLogPage(page, userId, type, uid);
     }
 
+    @Override
+    public IPage<HotelOrder> getShopWashOrderPage(Page<HotelOrder> page, String userId) {
+        return baseMapper.getShopWashOrderPage(page, userId);
+    }
+
     @Override
     public HotelOrder getOrderByUserIdById(String userId, String id) {
         return baseMapper.getOrderByUserIdById(userId, id);
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/controller/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/controller/OrderController.java
index 6bf11ba..a8f7eb5 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/controller/OrderController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/controller/OrderController.java
@@ -33,12 +33,25 @@ public class OrderController {
         return orderService.orderPage3(orderPageReq);
     }
 
+    @ApiOperation(value = "水洗店水洗订单分页", notes = "水洗店水洗订单分页")
+    @GetMapping("/wash/shop/page")
+    public Result<?> shopWashOrderPage(HttpServletRequest request,OrderPageReq orderPageReq){
+        orderPageReq.setToken(TokenUtils.getTokenByRequest(request));
+        return orderService.shopWashOrderPage(orderPageReq);
+    }
+
     @ApiOperation(value = "详情", notes = "详情")
     @GetMapping("/one")
     public Result<?> orderDetail(HttpServletRequest request,String id){
         return orderService.orderDetail3(id,TokenUtils.getTokenByRequest(request));
     }
 
+    @ApiOperation(value = "水洗店水洗订单详情", notes = "水洗店水洗订单详情")
+    @GetMapping("/wash/shop/one")
+    public Result<?> shopWashOrderDetail(HttpServletRequest request,String id){
+        return orderService.shopWashOrderDetail(id,TokenUtils.getTokenByRequest(request));
+    }
+
     @ApiOperation(value = "退货、换货申请")
     @PostMapping("/refund")
     public Result<?> applyRefundOrder(HttpServletRequest request,ApplyRefundOrderReq applyRefundOrderReq){
@@ -123,4 +136,18 @@ public class OrderController {
         return orderService.cancelOrder2(cancelOrderReq);
     }
 
+    @ApiOperation(value = "水洗店水洗订单确认收货")
+    @PostMapping("/shop/wash/receipt")
+    public Result<?> shopReceiptOrder(HttpServletRequest request,ShopReceiptOrderReq shopReceiptOrderReq){
+        shopReceiptOrderReq.setToken(TokenUtils.getTokenByRequest(request));
+        return orderService.shopReceiptOrder(shopReceiptOrderReq);
+    }
+
+    @ApiOperation(value = "酒店端水洗订单确认收货")
+    @PostMapping("/wash/receipt")
+    public Result<?> receiptWashOrder(HttpServletRequest request,ShopReceiptOrderReq shopReceiptOrderReq){
+        shopReceiptOrderReq.setToken(TokenUtils.getTokenByRequest(request));
+        return orderService.receiptWashOrder(shopReceiptOrderReq);
+    }
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ConfirmAcceptOrderReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ConfirmAcceptOrderReq.java
index 58f14b3..8c04e4c 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ConfirmAcceptOrderReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ConfirmAcceptOrderReq.java
@@ -25,6 +25,9 @@ public class ConfirmAcceptOrderReq {
     private String pic;
     @ApiModelProperty(value = "订单详情Id")
     private String orderDetailId;
+    /**物流方式 0快递 1自行配送*/
+    @ApiModelProperty(value = "物流方式 0快递 1自行配送")
+    private Integer logisticsFlag;
 
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ShopReceiptOrderReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ShopReceiptOrderReq.java
new file mode 100644
index 0000000..6effc60
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ShopReceiptOrderReq.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.xcx.order.req;
+
+import lombok.Data;
+
+@Data
+public class ShopReceiptOrderReq {
+
+    private String token;
+    /**订单Id*/
+    private String id;
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/IOrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/IOrderService.java
index 17660cf..ac35698 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/IOrderService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/IOrderService.java
@@ -21,6 +21,13 @@ public interface IOrderService {
 
     Result<?> orderPage3(OrderPageReq orderPageReq);
 
+    /**
+     * 水洗店水洗订单分页
+     * @param orderPageReq
+     * @return
+     */
+    Result<?> shopWashOrderPage(OrderPageReq orderPageReq);
+
     /**
      * 订单详情
      * @param id
@@ -33,6 +40,14 @@ public interface IOrderService {
 
     Result<?> orderDetail3(String id,String token);
 
+    /**
+     * 水洗店水洗订单详情
+     * @param id
+     * @param token
+     * @return
+     */
+    Result<?> shopWashOrderDetail(String id,String token);
+
     /**
      * 创建订单
      * @param req
@@ -123,6 +138,20 @@ public interface IOrderService {
      */
     Result<?> confirmAcceptOrder(ConfirmAcceptOrderReq confirmAcceptOrderReq);
 
+    /**
+     * 水洗店水洗订单确认收货
+     * @param shopReceiptOrderReq
+     * @return
+     */
+    Result<?> shopReceiptOrder(ShopReceiptOrderReq shopReceiptOrderReq);
+
+    /**
+     * 酒店端水洗订单确认收货
+     * @param shopReceiptOrderReq
+     * @return
+     */
+    Result<?> receiptWashOrder(ShopReceiptOrderReq shopReceiptOrderReq);
+
     /**
      * 取消订单
      * @param cancelOrderReq
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 992fc40..7e4d909 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
@@ -200,6 +200,21 @@ public class OrderServiceImpl implements IOrderService {
         return Result.OK(orderPage);
     }
 
+    @Override
+    public Result<?> shopWashOrderPage(OrderPageReq orderPageReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(orderPageReq.getToken());
+        Page<HotelOrder> page = new Page<>(orderPageReq.getPageNo(), orderPageReq.getPageSize());
+        IPage<HotelOrder> shopWashOrderPage = hotelOrderService.getShopWashOrderPage(page, hanHaiMember.getId());
+        BigDecimal platformServiceRate = new BigDecimal(hotelConfService.getConf("platformServiceRate"));
+        if(shopWashOrderPage != null && shopWashOrderPage.getRecords().size() != 0){
+            for (HotelOrder hotelOrder:shopWashOrderPage.getRecords()){
+                BigDecimal multiply = hotelOrder.getOrderPay().multiply(platformServiceRate);
+                hotelOrder.setOrderPay(hotelOrder.getOrderPay().subtract(multiply));
+            }
+        }
+        return Result.OK(shopWashOrderPage);
+    }
+
 
     @Override
     public Result<?> orderDetail(String id, String token) {
@@ -241,6 +256,31 @@ public class OrderServiceImpl implements IOrderService {
     public Result<?> orderDetail3(String id, String token) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         HotelOrder hotelOrder = hotelOrderService.getOrderOne3(id,hanHaiMember.getId());
+        BigDecimal platformServiceRate = new BigDecimal(hotelConfService.getConf("platformServiceRate"));
+        BigDecimal multiply = hotelOrder.getOrderPay().multiply(platformServiceRate);
+        hotelOrder.setShopCoin(hotelOrder.getOrderPay().subtract(multiply).setScale(2,BigDecimal.ROUND_HALF_UP));
+        List<HotelOrderDetail> hotelOrderDetails = hotelOrderDetailService.lambdaQuery()
+                .eq(HotelOrderDetail::getDelFlag, 0)
+                .eq(HotelOrderDetail::getOrderId, hotelOrder.getId())
+                .list();
+        hotelOrder.setOrderDetails(hotelOrderDetails);
+        List<HotelOrderFlow> hotelOrderFlows = hotelOrderFlowService.lambdaQuery()
+                .eq(HotelOrderFlow::getDelFlag, 0)
+                .eq(HotelOrderFlow::getPid, hotelOrder.getType())
+                .orderByAsc(HotelOrderFlow::getSort)
+                .list();
+        hotelOrder.setHotelOrderFlows(hotelOrderFlows);
+
+        return Result.OK(hotelOrder);
+    }
+
+    @Override
+    public Result<?> shopWashOrderDetail(String id, String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        HotelOrder hotelOrder = hotelOrderService.getOrderOne3(id,hanHaiMember.getId());
+        BigDecimal platformServiceRate = new BigDecimal(hotelConfService.getConf("platformServiceRate"));
+        BigDecimal multiply = hotelOrder.getOrderPay().multiply(platformServiceRate);
+        hotelOrder.setOrderPay(hotelOrder.getOrderPay().subtract(multiply));
         List<HotelOrderDetail> hotelOrderDetails = hotelOrderDetailService.lambdaQuery()
                 .eq(HotelOrderDetail::getDelFlag, 0)
                 .eq(HotelOrderDetail::getOrderId, hotelOrder.getId())
@@ -1057,7 +1097,7 @@ public class OrderServiceImpl implements IOrderService {
             throw new JeecgBootException("请选择地址");
         }
 
-        //押金
+        //租金
         String depositPrice1 = hotelConfService.getConf("depositPrice");
         BigDecimal depositPrice = new BigDecimal(depositPrice1);
 
@@ -1132,7 +1172,8 @@ public class OrderServiceImpl implements IOrderService {
                         .eq(HotelCategory::getId, hotelGoods.getCategoryId())
                         .one();
 
-                BigDecimal price = depositPrice.multiply(new BigDecimal(createOrderReq.getNum()));
+                //计算押金
+                BigDecimal price = hotelGoodsSku.getPrice().multiply(new BigDecimal(createOrderReq.getNum()));
                 totalPrice = totalPrice.add(price);
                 hotelOrder.setDeposit(totalPrice);
 
@@ -1238,7 +1279,7 @@ public class OrderServiceImpl implements IOrderService {
                     untilDay = DateUtils2.getUntilDay(hotelLeaseLog2.getStartTime(), DateUtils2.getDate(DateUtils2.getNowDate()));
 //                untilDay = untilDay == null
                     /*租金费用*/
-                    BigDecimal sumDepositPrice = hotelGoodsSku.getPrice().multiply(new BigDecimal(untilDay).multiply(new BigDecimal(hotelLeaseLog2.getNum())));
+                    BigDecimal sumDepositPrice = depositPrice.multiply(new BigDecimal(untilDay).multiply(new BigDecimal(hotelLeaseLog2.getNum())));
                     totalRentPrice = totalRentPrice.add(sumDepositPrice);
 //                    }
                 }
@@ -1286,19 +1327,21 @@ public class OrderServiceImpl implements IOrderService {
 
         BigDecimal originalPrice = totalPrice;
         hotelOrder.setOriginalPrice(originalPrice);
-        hotelOrder.setDiscountPrice(couponPrice);
+
         hotelOrder.setRentPay(totalRentPrice);
         hotelOrder.setWashPay(totalwashPrice);
         if(createOrderReqs.get(0).getType() == 0 && couponFlag == 1){
 
             if(totalPrice.compareTo(couponCondition) >= 0){
                 totalPrice = totalPrice.subtract(couponPrice);
+                hotelOrder.setDiscountPrice(couponPrice);
             }
         }else if(createOrderReqs.get(0).getType() == 1 && leaseCouponFlag == 1){
             if(totalRentPrice.compareTo(leaseCouponCondition) >= 0){
                 totalRentPrice = totalRentPrice.subtract(leaseCouponPrice);
                 totalPrice = totalRentPrice.add(totalwashPrice);
                 hotelOrder.setRentPay(totalRentPrice);
+                hotelOrder.setDiscountPrice(leaseCouponPrice);
             }
 
         }
@@ -3027,7 +3070,12 @@ public class OrderServiceImpl implements IOrderService {
         if(confirmAcceptOrderReq.getFlag() == 0){
             switch (hotelOrder.getType()){
                 case 1:
-                    hotelOrder1.setStatus(5);
+                    if(confirmAcceptOrderReq.getLogisticsFlag() == 0){
+                        hotelOrder1.setStatus(20);
+                    }else{
+                        hotelOrder1.setStatus(21);
+                    }
+
                     break;
                 case 2:
                     hotelOrder1.setStatus(17);
@@ -3042,15 +3090,12 @@ public class OrderServiceImpl implements IOrderService {
                     hotelOrder1.setStatus(6);
                     break;
                 case 6:
-                    HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery()
-                            .eq(HotelLeaseLog::getDelFlag, 0)
-                            .eq(HotelLeaseLog::getId, hotelOrderDetails.get(0).getLeaseId())
-                            .one();
-                    HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
-                    hotelLeaseLog1.setId(hotelLeaseLog.getId());
-                    hotelLeaseLog1.setWashNum(hotelLeaseLog.getWashNum() - hotelOrderDetails.get(0).getNum());
-                    hotelLeaseLogService.updateById(hotelLeaseLog1);
-                    hotelOrder1.setStatus(15);
+                    if(confirmAcceptOrderReq.getLogisticsFlag() == 0){
+                        hotelOrder1.setStatus(22);
+                    }else{
+                        hotelOrder1.setStatus(23);
+                    }
+
                     break;
             }
 
@@ -3125,6 +3170,56 @@ public class OrderServiceImpl implements IOrderService {
         return Result.OK();
     }
 
+    @Override
+    public Result<?> shopReceiptOrder(ShopReceiptOrderReq shopReceiptOrderReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(shopReceiptOrderReq.getToken());
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getId, shopReceiptOrderReq.getId())
+                .eq(HotelOrder::getType, 1)
+                .eq(HotelOrder::getStatus, 21)
+                .one();
+
+        HotelOrder hotelOrder1 = new HotelOrder();
+        hotelOrder1.setId(hotelOrder.getId());
+        hotelOrder1.setStatus(5);
+        hotelOrderService.updateById(hotelOrder1);
+
+        return Result.OK();
+    }
+
+    @Override
+    public Result<?> receiptWashOrder(ShopReceiptOrderReq shopReceiptOrderReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(shopReceiptOrderReq.getToken());
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getId, shopReceiptOrderReq.getId())
+                .eq(HotelOrder::getType, 1)
+                .eq(HotelOrder::getStatus, 23)
+                .one();
+
+//        List<HotelOrderDetail> hotelOrderDetails = hotelOrderDetailService.lambdaQuery()
+//                .eq(HotelOrderDetail::getDelFlag, 0)
+//                .eq(HotelOrderDetail::getOrderId, hotelOrder.getId())
+//                .list();
+
+//        HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery()
+//                .eq(HotelLeaseLog::getDelFlag, 0)
+//                .eq(HotelLeaseLog::getId, hotelOrderDetails.get(0).getLeaseId())
+//                .one();
+//        HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
+//        hotelLeaseLog1.setId(hotelLeaseLog.getId());
+//        hotelLeaseLog1.setWashNum(hotelLeaseLog.getWashNum() - hotelOrderDetails.get(0).getNum());
+//        hotelLeaseLogService.updateById(hotelLeaseLog1);
+
+        HotelOrder hotelOrder1 = new HotelOrder();
+        hotelOrder1.setId(hotelOrder.getId());
+        hotelOrder1.setStatus(15);
+        hotelOrderService.updateById(hotelOrder1);
+
+        return Result.OK();
+    }
+
     @Override
     public Result<?> cancelOrder(CancelOrderReq cancelOrderReq) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(cancelOrderReq.getToken());
@@ -3278,7 +3373,20 @@ public class OrderServiceImpl implements IOrderService {
         hotelOrder1.setId(hotelOrder.getId());
         hotelOrder1.setLogisticsName(sendLogisticsReq.getLogisticsName());
         hotelOrder1.setLogisticsCode(sendLogisticsReq.getLogisticsCode());
-        hotelOrder1.setStatus(9);
+        switch (hotelOrder.getType()){
+            case 1:
+                if(hotelOrder.getStatus() == 4){
+                    hotelOrder1.setStatus(21);
+                }else if(hotelOrder.getStatus() == 6){
+                    hotelOrder1.setStatus(23);
+                }
+
+                break;
+            case 2:
+                hotelOrder1.setStatus(9);
+                break;
+        }
+
         hotelOrderService.updateById(hotelOrder1);
 
 
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/controller/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/controller/UserController.java
index 5005313..fdc13d5 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/controller/UserController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/controller/UserController.java
@@ -52,4 +52,10 @@ public class UserController {
     }
 
 
+    @ApiOperation(value = "我的物品里所有租金")
+    @GetMapping("/lease/all/deposit/price")
+    public Result<?> myLeaseAllDepositPrice(HttpServletRequest request){
+        return userService.myLeaseAllDepositPrice(TokenUtils.getTokenByRequest(request));
+    }
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/IUserService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/IUserService.java
index b7093c4..9d25fae 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/IUserService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/IUserService.java
@@ -34,4 +34,11 @@ public interface IUserService {
      */
     Result<?> getCustom();
 
+    /**
+     * 获取我的物品里所有租金
+     * @param token
+     * @return
+     */
+    Result<?> myLeaseAllDepositPrice(String token);
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/UserServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/UserServiceImpl.java
index 36a3a23..23b8550 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/UserServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/UserServiceImpl.java
@@ -20,6 +20,7 @@ import org.jeecg.modules.xcx.user.service.IUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -98,4 +99,11 @@ public class UserServiceImpl implements IUserService {
         map.put("phone",customerService);
         return Result.OK(map);
     }
+
+    @Override
+    public Result<?> myLeaseAllDepositPrice(String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        BigDecimal allDepositPrice = hotelLeaseLogService.getAllDepositPrice(hanHaiMember.getId());
+        return Result.OK(allDepositPrice);
+    }
 }