From 3869708ff2d7a826f312ad7ec6e47a62349c528f Mon Sep 17 00:00:00 2001
From: ieaii <1069385070@qq.com>
Date: Tue, 15 Oct 2024 00:10:48 +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

---
 .../src/views/system/HotelCouponList.vue           | 221 ++++++++++++++++
 .../src/views/system/HotelShopList.vue             |  34 ++-
 .../src/views/system/RefundOrderList.vue           | 254 ++++++++++++++++++
 .../src/views/system/ReplaceOrderList.vue          | 254 ++++++++++++++++++
 .../src/views/system/WashOrderList.vue             | 285 +++++++++++++++++++++
 .../src/views/system/modules/HotelCouponForm.vue   | 149 +++++++++++
 .../modules/HotelCouponModal.Style#Drawer.vue      |  84 ++++++
 .../src/views/system/modules/HotelCouponModal.vue  |  60 +++++
 .../src/views/system/modules/WashOrderForm.vue     |  99 +++++++
 .../system/modules/WashOrderModal.Style#Drawer.vue |  84 ++++++
 .../src/views/system/modules/WashOrderModal.vue    |  66 +++++
 .../target/jeecg-system-cloud-api-3.2.0.jar        | Bin 9792 -> 9792 bytes
 .../java/org/jeecg/config/shiro/ShiroConfig.java   |   2 +
 .../hanHaiMember/mapper/HanHaiMemberMapper.java    |   9 +
 .../hanHaiMember/mapper/xml/HanHaiMemberMapper.xml |  12 +-
 .../hanHaiMember/service/IHanHaiMemberService.java |   8 +
 .../service/impl/HanHaiMemberServiceImpl.java      |   5 +
 .../controller/HotelCouponController.java          | 171 +++++++++++++
 .../modules/hotelcoupon/entity/HotelCoupon.java    |  87 +++++++
 .../hotelcoupon/mapper/HotelCouponMapper.java      |  17 ++
 .../hotelcoupon/mapper/xml/HotelCouponMapper.xml   |   5 +
 .../hotelcoupon/service/IHotelCouponService.java   |  14 +
 .../service/impl/HotelCouponServiceImpl.java       |  19 ++
 .../modules/hotelcoupon/vue/HotelCouponList.vue    | 216 ++++++++++++++++
 .../hotelcoupon/vue/modules/HotelCouponForm.vue    | 144 +++++++++++
 .../vue/modules/HotelCouponModal.Style#Drawer.vue  |  84 ++++++
 .../hotelcoupon/vue/modules/HotelCouponModal.vue   |  60 +++++
 .../modules/hotelcoupon/vue3/HotelCoupon.api.ts    |  61 +++++
 .../modules/hotelcoupon/vue3/HotelCoupon.data.ts   | 108 ++++++++
 .../modules/hotelcoupon/vue3/HotelCouponList.vue   | 162 ++++++++++++
 .../vue3/components/HotelCouponModal.vue           |  58 +++++
 .../controller/HotelCouponLogController.java       | 171 +++++++++++++
 .../hotelcouponlog/entity/HotelCouponLog.java      |  97 +++++++
 .../mapper/HotelCouponLogMapper.java               |  17 ++
 .../mapper/xml/HotelCouponLogMapper.xml            |   5 +
 .../service/IHotelCouponLogService.java            |  14 +
 .../service/impl/HotelCouponLogServiceImpl.java    |  19 ++
 .../hotelcouponlog/vue/HotelCouponLogList.vue      | 232 +++++++++++++++++
 .../vue/modules/HotelCouponLogForm.vue             | 163 ++++++++++++
 .../modules/HotelCouponLogModal.Style#Drawer.vue   |  84 ++++++
 .../vue/modules/HotelCouponLogModal.vue            |  60 +++++
 .../hotelcouponlog/vue3/HotelCouponLog.api.ts      |  61 +++++
 .../hotelcouponlog/vue3/HotelCouponLog.data.ts     | 135 ++++++++++
 .../hotelcouponlog/vue3/HotelCouponLogList.vue     | 162 ++++++++++++
 .../vue3/components/HotelCouponLogModal.vue        |  58 +++++
 .../controller/HotelOrderController.java           | 220 ++++++++++++++++
 .../modules/hotelorder/entity/HotelOrder.java      |   4 +-
 .../modules/hotelorder/req/DamageAuditReq.java     |  14 +
 .../hotelshop/controller/HotelShopController.java  |  54 ++++
 .../jeecg/modules/hotelshop/entity/HotelShop.java  |   4 +
 .../jeecg/modules/hotelshop/req/AuditShopReq.java  |  13 +
 .../controller/HotelShopLogController.java         | 171 +++++++++++++
 .../modules/hotelshoplog/entity/HotelShopLog.java  |  65 +++++
 .../hotelshoplog/mapper/HotelShopLogMapper.java    |  17 ++
 .../hotelshoplog/mapper/xml/HotelShopLogMapper.xml |   5 +
 .../hotelshoplog/service/IHotelShopLogService.java |  14 +
 .../service/impl/HotelShopLogServiceImpl.java      |  19 ++
 .../modules/hotelshoplog/vue/HotelShopLogList.vue  | 190 ++++++++++++++
 .../hotelshoplog/vue/modules/HotelShopLogForm.vue  | 120 +++++++++
 .../vue/modules/HotelShopLogModal.Style#Drawer.vue |  84 ++++++
 .../hotelshoplog/vue/modules/HotelShopLogModal.vue |  60 +++++
 .../modules/hotelshoplog/vue3/HotelShopLog.api.ts  |  61 +++++
 .../modules/hotelshoplog/vue3/HotelShopLog.data.ts |  56 ++++
 .../modules/hotelshoplog/vue3/HotelShopLogList.vue | 162 ++++++++++++
 .../vue3/components/HotelShopLogModal.vue          |  58 +++++
 .../org/jeecg/config/shiro/ShiroConfig.class       | Bin 11557 -> 11632 bytes
 .../hanHaiMember/mapper/HanHaiMemberMapper.class   | Bin 1063 -> 1206 bytes
 .../hanHaiMember/mapper/xml/HanHaiMemberMapper.xml |  12 +-
 .../service/IHanHaiMemberService.class             | Bin 942 -> 1170 bytes
 .../service/impl/HanHaiMemberServiceImpl.class     | Bin 1970 -> 2177 bytes
 .../target/jeecg-boot-base-core-3.2.0.jar          | Bin 515943 -> 531879 bytes
 .../xcx/coupon/controller/CouponController.java    |  13 +
 .../modules/xcx/coupon/req/CouponPageReq.java      |  12 +
 .../modules/xcx/coupon/service/ICouponService.java |  16 ++
 .../xcx/coupon/service/impl/CouponServiceImpl.java |  39 +++
 .../modules/xcx/goods/req/JoinShoppingCartReq.java |   2 +
 .../xcx/goods/service/impl/GoodsServiceImpl.java   |   4 +-
 .../xcx/order/controller/OrderController.java      |  14 +
 .../xcx/order/req/ConfirmAcceptOrderReq.java       |  18 +-
 .../jeecg/modules/xcx/order/req/OrderPageReq.java  |   2 +-
 .../jeecg/modules/xcx/order/req/OrderPayReq.java   |   2 +
 .../modules/xcx/order/req/ReplaceOrderPayReq.java  |  12 +
 .../modules/xcx/order/service/IOrderService.java   |  15 ++
 .../xcx/order/service/impl/OrderServiceImpl.java   | 146 ++++++++++-
 .../xcx/shop/controller/ShopController.java        |   7 +
 .../jeecg/modules/xcx/shop/req/ApplyShopReq.java   |   1 +
 .../modules/xcx/shop/req/EditShopInfoReq.java      |  15 ++
 .../modules/xcx/shop/service/IShopService.java     |   7 +
 .../xcx/shop/service/impl/ShopServiceImpl.java     |  32 ++-
 .../xcx/user/controller/UserController.java        |   6 +
 .../modules/xcx/user/service/IUserService.java     |   6 +
 .../xcx/user/service/impl/LoginServiceImpl.java    |   4 +
 .../xcx/user/service/impl/UserServiceImpl.java     |  13 +
 .../src/main/resources/application-dev.yml         |   7 +-
 .../src/main/resources/application-pord.yml        |   8 +-
 95 files changed, 5878 insertions(+), 36 deletions(-)
 create mode 100644 admin-hanhai-vue/src/views/system/HotelCouponList.vue
 create mode 100644 admin-hanhai-vue/src/views/system/RefundOrderList.vue
 create mode 100644 admin-hanhai-vue/src/views/system/ReplaceOrderList.vue
 create mode 100644 admin-hanhai-vue/src/views/system/WashOrderList.vue
 create mode 100644 admin-hanhai-vue/src/views/system/modules/HotelCouponForm.vue
 create mode 100644 admin-hanhai-vue/src/views/system/modules/HotelCouponModal.Style#Drawer.vue
 create mode 100644 admin-hanhai-vue/src/views/system/modules/HotelCouponModal.vue
 create mode 100644 admin-hanhai-vue/src/views/system/modules/WashOrderForm.vue
 create mode 100644 admin-hanhai-vue/src/views/system/modules/WashOrderModal.Style#Drawer.vue
 create mode 100644 admin-hanhai-vue/src/views/system/modules/WashOrderModal.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/controller/HotelCouponController.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/entity/HotelCoupon.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/HotelCouponMapper.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/xml/HotelCouponMapper.xml
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/IHotelCouponService.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/impl/HotelCouponServiceImpl.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/HotelCouponList.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponForm.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.Style#Drawer.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.api.ts
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.data.ts
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCouponList.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/components/HotelCouponModal.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/controller/HotelCouponLogController.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/entity/HotelCouponLog.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/HotelCouponLogMapper.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/xml/HotelCouponLogMapper.xml
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/IHotelCouponLogService.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/impl/HotelCouponLogServiceImpl.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/HotelCouponLogList.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogForm.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.Style#Drawer.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.api.ts
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.data.ts
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLogList.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/components/HotelCouponLogModal.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/req/DamageAuditReq.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/req/AuditShopReq.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/controller/HotelShopLogController.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/entity/HotelShopLog.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/HotelShopLogMapper.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/xml/HotelShopLogMapper.xml
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/IHotelShopLogService.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/impl/HotelShopLogServiceImpl.java
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/HotelShopLogList.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogForm.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.Style#Drawer.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.api.ts
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.data.ts
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLogList.vue
 create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/components/HotelShopLogModal.vue
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/controller/CouponController.java
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/req/CouponPageReq.java
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/ICouponService.java
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/impl/CouponServiceImpl.java
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ReplaceOrderPayReq.java
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/EditShopInfoReq.java

diff --git a/admin-hanhai-vue/src/views/system/HotelCouponList.vue b/admin-hanhai-vue/src/views/system/HotelCouponList.vue
new file mode 100644
index 0000000..d9d28cf
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/HotelCouponList.vue
@@ -0,0 +1,221 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_coupon')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-coupon-modal ref="modalForm" @ok="modalFormOk"></hotel-coupon-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelCouponModal from './modules/HotelCouponModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'HotelCouponList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelCouponModal
+    },
+    data () {
+      return {
+        description: 'hotel_coupon管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'优惠券名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'券额',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'满多少金额',
+            align:"center",
+            dataIndex: 'conditionPrice'
+          },
+          {
+            title:'说明',
+            align:"center",
+            dataIndex: 'info',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title:'优惠券结束时间',
+            align:"center",
+            dataIndex: 'endTime'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'使用类型',
+            align:"center",
+            dataIndex: 'useType_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelcoupon/hotelCoupon/list",
+          delete: "/hotelcoupon/hotelCoupon/delete",
+          deleteBatch: "/hotelcoupon/hotelCoupon/deleteBatch",
+          exportXlsUrl: "/hotelcoupon/hotelCoupon/exportXls",
+          importExcelUrl: "hotelcoupon/hotelCoupon/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'优惠券名',dictCode:''})
+        fieldList.push({type:'string',value:'pic',text:'图片',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'券额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'conditionPrice',text:'满多少金额',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'说明',dictCode:''})
+        fieldList.push({type:'datetime',value:'endTime',text:'优惠券结束时间'})
+        fieldList.push({type:'int',value:'type',text:'类型 0指定时间 1单次',dictCode:'coupon_type'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/HotelShopList.vue b/admin-hanhai-vue/src/views/system/HotelShopList.vue
index 226c305..b046f86 100644
--- a/admin-hanhai-vue/src/views/system/HotelShopList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelShopList.vue
@@ -68,12 +68,23 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+
+          <div v-if="record.status === 0">
+            <a @click="handleAudit(0,record)">通过</a>
 
           <a-divider type="vertical" />
+
+          <a @click="handleAudit(1,record)">不通过</a>
+
+          <a-divider type="vertical" />
+          </div>
+
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleEdit(record)">编辑</a>
+              </a-menu-item>
               <a-menu-item>
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
@@ -99,6 +110,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HotelShopModal from './modules/HotelShopModal'
+  import {httpAction} from "@api/manage";
 
   export default {
     name: 'HotelShopList',
@@ -207,6 +219,7 @@
           deleteBatch: "/hotelshop/hotelShop/deleteBatch",
           exportXlsUrl: "/hotelshop/hotelShop/exportXls",
           importExcelUrl: "hotelshop/hotelShop/importExcel",
+          auditUrl: "/hotelshop/hotelShop/audit"
 
         },
         dictOptions:{},
@@ -227,7 +240,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'商铺名',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'userId',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
         fieldList.push({type:'string',value:'userName',text:'店主名',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'手机号',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'latitude',dictCode:''})
@@ -235,6 +248,23 @@
         fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
         fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
         this.superFieldList = fieldList
+      },
+      handleAudit(e,obj){
+        let param = {
+          id:obj.id,
+          audit:e
+        }
+        console.log(e,obj)
+        httpAction(this.url.auditUrl,param,'post').then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+            this.$emit('ok');
+          }else{
+            this.$message.warning(res.message);
+          }
+        }).finally(() => {
+          this.loadData(1)
+        })
       }
     }
   }
diff --git a/admin-hanhai-vue/src/views/system/RefundOrderList.vue b/admin-hanhai-vue/src/views/system/RefundOrderList.vue
new file mode 100644
index 0000000..9362cc0
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/RefundOrderList.vue
@@ -0,0 +1,254 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_order')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-order-modal ref="modalForm" @ok="modalFormOk"></hotel-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelOrderModal from './modules/HotelOrderModal'
+
+  export default {
+    name: 'RefundOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelOrderModal
+    },
+    data () {
+      return {
+        description: '退货订单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'客户姓名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'客户手机号',
+            align:"center",
+            dataIndex: 'userPhone'
+          },
+          {
+            title:'用户地址',
+            align:"center",
+            dataIndex: 'userAddress'
+          },
+          {
+            title:'用户编号',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'店铺编号',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'租赁时间',
+            align:"center",
+            dataIndex: 'leaseTime'
+          },
+          {
+            title:'缴纳费用',
+            align:"center",
+            dataIndex: 'payFee'
+          },
+          {
+            title:'押金',
+            align:"center",
+            dataIndex: 'deposit'
+          },
+          {
+            title:'水洗费用',
+            align:"center",
+            dataIndex: 'washPay'
+          },
+          {
+            title:'水洗费用',
+            align:"center",
+            dataIndex: 'rentPay'
+          },
+          {
+            title:'支付金额',
+            align:"center",
+            dataIndex: 'orderPay'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelorder/hotelOrder/refund/list",
+          delete: "/hotelorder/hotelOrder/delete",
+          deleteBatch: "/hotelorder/hotelOrder/deleteBatch",
+          exportXlsUrl: "/hotelorder/hotelOrder/exportXls",
+          importExcelUrl: "hotelorder/hotelOrder/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'userName',text:'客户姓名',dictCode:''})
+        fieldList.push({type:'string',value:'userPhone',text:'客户手机号',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'店铺编号',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'状态',dictCode:'order_status'})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'hotel_order_type'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue b/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue
new file mode 100644
index 0000000..950065b
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/ReplaceOrderList.vue
@@ -0,0 +1,254 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_order')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-order-modal ref="modalForm" @ok="modalFormOk"></hotel-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelOrderModal from './modules/HotelOrderModal'
+
+  export default {
+    name: 'ReplaceOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelOrderModal
+    },
+    data () {
+      return {
+        description: '换货订单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'客户姓名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'客户手机号',
+            align:"center",
+            dataIndex: 'userPhone'
+          },
+          {
+            title:'用户地址',
+            align:"center",
+            dataIndex: 'userAddress'
+          },
+          {
+            title:'用户编号',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'店铺编号',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'租赁时间',
+            align:"center",
+            dataIndex: 'leaseTime'
+          },
+          {
+            title:'缴纳费用',
+            align:"center",
+            dataIndex: 'payFee'
+          },
+          {
+            title:'押金',
+            align:"center",
+            dataIndex: 'deposit'
+          },
+          {
+            title:'水洗费用',
+            align:"center",
+            dataIndex: 'washPay'
+          },
+          {
+            title:'水洗费用',
+            align:"center",
+            dataIndex: 'rentPay'
+          },
+          {
+            title:'支付金额',
+            align:"center",
+            dataIndex: 'orderPay'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelorder/hotelOrder/replace/list",
+          delete: "/hotelorder/hotelOrder/delete",
+          deleteBatch: "/hotelorder/hotelOrder/deleteBatch",
+          exportXlsUrl: "/hotelorder/hotelOrder/exportXls",
+          importExcelUrl: "hotelorder/hotelOrder/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'userName',text:'客户姓名',dictCode:''})
+        fieldList.push({type:'string',value:'userPhone',text:'客户手机号',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'店铺编号',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'状态',dictCode:'order_status'})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'hotel_order_type'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/WashOrderList.vue b/admin-hanhai-vue/src/views/system/WashOrderList.vue
new file mode 100644
index 0000000..d3216f2
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/WashOrderList.vue
@@ -0,0 +1,285 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_order')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+
+<!--          <a-divider type="vertical" />-->
+          <div v-if="record.status === 16">
+            <a @click="handleAudit(0,record)">通过</a>
+          <a-divider type="vertical" />
+          <a @click="handleAudit2(1,record)">不通过</a>
+          <a-divider type="vertical" />
+          </div>
+
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-order-modal ref="modalForm" @ok="modalFormOk"></hotel-order-modal>
+    <wash-order-modal ref="modalForm2" @ok="modalFormOk"></wash-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelOrderModal from './modules/HotelOrderModal'
+  import WashOrderModal from './modules/WashOrderModal'
+  import {httpAction} from "@api/manage";
+
+  export default {
+    name: 'WashOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelOrderModal,
+      WashOrderModal
+    },
+    data () {
+      return {
+        description: '水洗订单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'客户姓名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'客户手机号',
+            align:"center",
+            dataIndex: 'userPhone'
+          },
+          {
+            title:'用户地址',
+            align:"center",
+            dataIndex: 'userAddress'
+          },
+          {
+            title:'用户编号',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'店铺编号',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'租赁时间',
+            align:"center",
+            dataIndex: 'leaseTime'
+          },
+          {
+            title:'缴纳费用',
+            align:"center",
+            dataIndex: 'payFee'
+          },
+          {
+            title:'押金',
+            align:"center",
+            dataIndex: 'deposit'
+          },
+          {
+            title:'水洗费用',
+            align:"center",
+            dataIndex: 'washPay'
+          },
+          {
+            title:'水洗费用',
+            align:"center",
+            dataIndex: 'rentPay'
+          },
+          {
+            title:'支付金额',
+            align:"center",
+            dataIndex: 'orderPay'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelorder/hotelOrder/wash/list",
+          delete: "/hotelorder/hotelOrder/delete",
+          deleteBatch: "/hotelorder/hotelOrder/deleteBatch",
+          exportXlsUrl: "/hotelorder/hotelOrder/exportXls",
+          importExcelUrl: "hotelorder/hotelOrder/importExcel",
+          damageAuditUrl: "/hotelorder/hotelOrder/damage/audit"
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'userName',text:'客户姓名',dictCode:''})
+        fieldList.push({type:'string',value:'userPhone',text:'客户手机号',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'店铺编号',dictCode:''})
+        // fieldList.push({type:'int',value:'status',text:'状态',dictCode:'order_status'})
+        // fieldList.push({type:'int',value:'type',text:'类型',dictCode:'hotel_order_type'})
+        // fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      },
+      handleAudit(e,obj){
+        obj.audit = e;
+        this.$refs.modalForm2.audit(obj);
+        this.$refs.modalForm2.title = "审核";
+        this.$refs.modalForm2.disableSubmit = false;
+        console.log(obj)
+      },
+      handleAudit2(e,obj){
+        obj.audit = e;
+        httpAction(this.url.damageAuditUrl,obj,'post').then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+            this.$emit('ok');
+          }else{
+            this.$message.warning(res.message);
+          }
+        }).finally(() => {
+          this.loadData();
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelCouponForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelCouponForm.vue
new file mode 100644
index 0000000..e5e8705
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelCouponForm.vue
@@ -0,0 +1,149 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="优惠券名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入优惠券名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pic">
+              <j-image-upload isMultiple  v-model="model.pic" ></j-image-upload>
+            </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>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="满多少金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionPrice">
+              <a-input-number v-model="model.conditionPrice" placeholder="请输入满多少金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <j-editor v-model="model.info" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="优惠券结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endTime">
+              <j-date placeholder="请选择优惠券结束时间"  v-model="model.endTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="coupon_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="使用类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useType">
+              <j-dict-select-tag type="list" v-model="model.useType" dictCode="coupon_use_type" placeholder="请选择使用类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'HotelCouponForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            type:0,
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/hotelcoupon/hotelCoupon/add",
+          edit: "/hotelcoupon/hotelCoupon/edit",
+          queryById: "/hotelcoupon/hotelCoupon/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelCouponModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelCouponModal.Style#Drawer.vue
new file mode 100644
index 0000000..298c557
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelCouponModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-coupon-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-coupon-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import HotelCouponForm from './HotelCouponForm'
+
+  export default {
+    name: 'HotelCouponModal',
+    components: {
+      HotelCouponForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelCouponModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelCouponModal.vue
new file mode 100644
index 0000000..1e12f68
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelCouponModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <hotel-coupon-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-coupon-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelCouponForm from './HotelCouponForm'
+  export default {
+    name: 'HotelCouponModal',
+    components: {
+      HotelCouponForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/modules/WashOrderForm.vue b/admin-hanhai-vue/src/views/system/modules/WashOrderForm.vue
new file mode 100644
index 0000000..2d4e7c7
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/WashOrderForm.vue
@@ -0,0 +1,99 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="refundPrice">
+              <a-input v-model="model.refundPrice" placeholder="请输入金额"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="audit">
+              <j-dict-select-tag type="radio" v-model="model.audit" dictCode="is_delete" placeholder="请选择是否审核" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'WashOrderForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        url: {
+          add: "/hotelorder/hotelOrder/add",
+          edit: "/hotelorder/hotelOrder/edit",
+          queryById: "/hotelorder/hotelOrder/queryById",
+          audit: "/hotelorder/hotelOrder/damage/audit"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      audit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+            that.confirmLoading = true;
+            httpAction(that.url.audit,this.model,'post').then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/modules/WashOrderModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/WashOrderModal.Style#Drawer.vue
new file mode 100644
index 0000000..f06de0a
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/WashOrderModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-order-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import HotelOrderForm from './WashOrderForm'
+
+  export default {
+    name: 'WashOrderModal',
+    components: {
+      HotelOrderForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/system/modules/WashOrderModal.vue b/admin-hanhai-vue/src/views/system/modules/WashOrderModal.vue
new file mode 100644
index 0000000..e57d3ac
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/WashOrderModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <wash-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></wash-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import WashOrderForm from './WashOrderForm'
+  export default {
+    name: 'WashOrderModal',
+    components: {
+      WashOrderForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      audit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.audit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar
index 059202c8d68424c374efb0149c093325de218899..4a08719410d4479d7b8dd0cc03b930824e0fd824 100644
GIT binary patch
delta 194
zcmX@$bHIl;z?+$ci-CcIfuXX>Zz8V>GmzS762}OlCr@QG2h-;n?ZLDllLMFzVbTKA
zjZ98p`WRCrh~BKk+|2}LY+!xI17<7~lHmg@IiO$y7Wl592Qgbi$sH_Fq~s5#k0=Fz
iX>nyMFdd>C1g2LiXM$-_l{_%rrjh}oH-A*|X9NHTKR-AC

delta 194
zcmX@$bHIl;z?+$ci-CcIfuV`Rdm^t2GmzS762}OlCr@QG2h-;n?ZLDllLMFzVbTKA
zjZ98p`WRCrh~BKk+|2}LY+!xI17<7~lHmg@IiO$y7Wl592Qgbi$sH_Fq~s5#k0=Fz
iX>nyMFdd>C1g2LiXM$-_l{_%rrjh}oH-A*|X9NJLyEX6t

diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 16cb891..cc35d67 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -80,6 +80,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/login/login", "anon");//分类接口
         filterChainDefinitionMap.put("/conf/customer", "anon");//分类接口
         filterChainDefinitionMap.put("/order/notify", "anon");//支付回调接口
+        filterChainDefinitionMap.put("/user/custom", "anon");//支付回调接口
+        filterChainDefinitionMap.put("/order/replace/notify", "anon");//支付回调接口
 
         filterChainDefinitionMap.put("/sys/oss/file/upload", "anon"); //图片上传验证放开
         filterChainDefinitionMap.put("/sys/common/upload", "anon"); //图片上传验证放开
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
index 3e19358..c5aab40 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
@@ -5,6 +5,7 @@ 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.Update;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.hanHaiMember.resp.MyUserResp;
@@ -35,4 +36,12 @@ public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {
      */
     ShopIndexResp getShopIndex(@Param("userId") String userId,@Param("shopId") String shopId);
 
+    /**
+     * 修改用户id
+     * @param oldId
+     * @param newId
+     * @return
+     */
+    Integer updateUserId(@Param("oldId") String oldId,@Param("newId") String newId);
+
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml
index fcaf936..28e546b 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml
@@ -9,10 +9,14 @@
 
     <select id="getShopIndex" resultType="org.jeecg.modules.hanHaiMember.resp.ShopIndexResp">
         select (select count(1) from han_hai_member where shop_id = #{shopId}) user,
-    (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 0) lease,
-           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 1) wash,
-           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 2) worn,
-           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 3) refund
+    (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (1,2,15) and type = 0) lease,
+           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (4,5,6,15,16) and type = 1) wash,
+           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (7,8,9,10,15) and type = 2) worn,
+           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (11,12,13,14,15) and type = 3) refund
     </select>
 
+    <update id="updateUserId">
+        UPDATE han_hai_member SET id = #{newId} WHERE id = #{oldId}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
index d39a12e..efe0779 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
@@ -19,4 +19,12 @@ public interface IHanHaiMemberService extends IService<HanHaiMember> {
     IPage<MyUserResp> getMyUser(Page<MyUserResp> page, String shopId);
 
     ShopIndexResp getShopIndex(String userId, String shopId);
+
+    /**
+     * 修改用户id
+     * @param oldId 老id
+     * @param newId 新id
+     * @return
+     */
+    Integer updateUserId(@Param("oldId") String oldId,@Param("newId") String newId);
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
index 2c0997a..8274486 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
@@ -30,4 +30,9 @@ public class HanHaiMemberServiceImpl extends ServiceImpl<HanHaiMemberMapper, Han
     public ShopIndexResp getShopIndex(String userId, String shopId) {
         return baseMapper.getShopIndex(userId, shopId);
     }
+
+    @Override
+    public Integer updateUserId(String oldId, String newId) {
+        return baseMapper.updateUserId(oldId, newId);
+    }
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/controller/HotelCouponController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/controller/HotelCouponController.java
new file mode 100644
index 0000000..98bc21c
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/controller/HotelCouponController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.hotelcoupon.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hotelcoupon.entity.HotelCoupon;
+import org.jeecg.modules.hotelcoupon.service.IHotelCouponService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: hotel_coupon
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+@Api(tags="hotel_coupon")
+@RestController
+@RequestMapping("/hotelcoupon/hotelCoupon")
+@Slf4j
+public class HotelCouponController extends JeecgController<HotelCoupon, IHotelCouponService> {
+	@Autowired
+	private IHotelCouponService hotelCouponService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param hotelCoupon
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_coupon-分页列表查询")
+	@ApiOperation(value="hotel_coupon-分页列表查询", notes="hotel_coupon-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<HotelCoupon>> queryPageList(HotelCoupon hotelCoupon,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<HotelCoupon> queryWrapper = QueryGenerator.initQueryWrapper(hotelCoupon, req.getParameterMap());
+		Page<HotelCoupon> page = new Page<HotelCoupon>(pageNo, pageSize);
+		IPage<HotelCoupon> pageList = hotelCouponService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param hotelCoupon
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon-添加")
+	@ApiOperation(value="hotel_coupon-添加", notes="hotel_coupon-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody HotelCoupon hotelCoupon) {
+		hotelCouponService.save(hotelCoupon);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param hotelCoupon
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon-编辑")
+	@ApiOperation(value="hotel_coupon-编辑", notes="hotel_coupon-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody HotelCoupon hotelCoupon) {
+		hotelCouponService.updateById(hotelCoupon);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon-通过id删除")
+	@ApiOperation(value="hotel_coupon-通过id删除", notes="hotel_coupon-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		hotelCouponService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon-批量删除")
+	@ApiOperation(value="hotel_coupon-批量删除", notes="hotel_coupon-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.hotelCouponService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_coupon-通过id查询")
+	@ApiOperation(value="hotel_coupon-通过id查询", notes="hotel_coupon-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<HotelCoupon> queryById(@RequestParam(name="id",required=true) String id) {
+		HotelCoupon hotelCoupon = hotelCouponService.getById(id);
+		if(hotelCoupon==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(hotelCoupon);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param hotelCoupon
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HotelCoupon hotelCoupon) {
+        return super.exportXls(request, hotelCoupon, HotelCoupon.class, "hotel_coupon");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HotelCoupon.class);
+    }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/entity/HotelCoupon.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/entity/HotelCoupon.java
new file mode 100644
index 0000000..cfe030f
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/entity/HotelCoupon.java
@@ -0,0 +1,87 @@
+package org.jeecg.modules.hotelcoupon.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: hotel_coupon
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("hotel_coupon")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="hotel_coupon对象", description="hotel_coupon")
+public class HotelCoupon implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**优惠券名*/
+	@Excel(name = "优惠券名", width = 15)
+    @ApiModelProperty(value = "优惠券名")
+    private java.lang.String name;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String pic;
+	/**券额*/
+	@Excel(name = "券额", width = 15)
+    @ApiModelProperty(value = "券额")
+    private java.math.BigDecimal price;
+	/**满多少金额*/
+	@Excel(name = "满多少金额", width = 15)
+    @ApiModelProperty(value = "满多少金额")
+    private java.math.BigDecimal conditionPrice;
+	/**说明*/
+	@Excel(name = "说明", width = 15)
+    @ApiModelProperty(value = "说明")
+    private java.lang.String info;
+	/**优惠券结束时间*/
+	@Excel(name = "优惠券结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "优惠券结束时间")
+    private java.util.Date endTime;
+	/**类型 0指定时间 1单次*/
+	@Excel(name = "类型 0指定时间 1单次", width = 15, dicCode = "coupon_type")
+	@Dict(dicCode = "coupon_type")
+    @ApiModelProperty(value = "类型 0指定时间 1单次")
+    private java.lang.Integer type;
+	/**是否删除*/
+	@Excel(name = "是否删除", width = 15, dicCode = "is_delete")
+	@Dict(dicCode = "is_delete")
+    @ApiModelProperty(value = "是否删除")
+    private java.lang.Integer delFlag;
+	/**createTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "createTime")
+    private java.util.Date createTime;
+	/**updateTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "updateTime")
+    private java.util.Date updateTime;
+	/**使用类型 0押金 1租金 2水洗*/
+	@Dict(dicCode = "coupon_use_type")
+	private Integer useType;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/HotelCouponMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/HotelCouponMapper.java
new file mode 100644
index 0000000..0e5406b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/HotelCouponMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.hotelcoupon.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.hotelcoupon.entity.HotelCoupon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: hotel_coupon
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+public interface HotelCouponMapper extends BaseMapper<HotelCoupon> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/xml/HotelCouponMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/xml/HotelCouponMapper.xml
new file mode 100644
index 0000000..742372b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/mapper/xml/HotelCouponMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.hotelcoupon.mapper.HotelCouponMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/IHotelCouponService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/IHotelCouponService.java
new file mode 100644
index 0000000..baa060f
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/IHotelCouponService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.hotelcoupon.service;
+
+import org.jeecg.modules.hotelcoupon.entity.HotelCoupon;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: hotel_coupon
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+public interface IHotelCouponService extends IService<HotelCoupon> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/impl/HotelCouponServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/impl/HotelCouponServiceImpl.java
new file mode 100644
index 0000000..508bb64
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/service/impl/HotelCouponServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.hotelcoupon.service.impl;
+
+import org.jeecg.modules.hotelcoupon.entity.HotelCoupon;
+import org.jeecg.modules.hotelcoupon.mapper.HotelCouponMapper;
+import org.jeecg.modules.hotelcoupon.service.IHotelCouponService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: hotel_coupon
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+@Service
+public class HotelCouponServiceImpl extends ServiceImpl<HotelCouponMapper, HotelCoupon> implements IHotelCouponService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/HotelCouponList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/HotelCouponList.vue
new file mode 100644
index 0000000..e7f0420
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/HotelCouponList.vue
@@ -0,0 +1,216 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('hotel_coupon')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-coupon-modal ref="modalForm" @ok="modalFormOk"></hotel-coupon-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelCouponModal from './modules/HotelCouponModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'HotelCouponList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelCouponModal
+    },
+    data () {
+      return {
+        description: 'hotel_coupon管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'优惠券名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'券额',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'满多少金额',
+            align:"center",
+            dataIndex: 'conditionPrice'
+          },
+          {
+            title:'说明',
+            align:"center",
+            dataIndex: 'info',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title:'优惠券结束时间',
+            align:"center",
+            dataIndex: 'endTime'
+          },
+          {
+            title:'类型 0指定时间 1单次',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelcoupon/hotelCoupon/list",
+          delete: "/hotelcoupon/hotelCoupon/delete",
+          deleteBatch: "/hotelcoupon/hotelCoupon/deleteBatch",
+          exportXlsUrl: "/hotelcoupon/hotelCoupon/exportXls",
+          importExcelUrl: "hotelcoupon/hotelCoupon/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'优惠券名',dictCode:''})
+        fieldList.push({type:'string',value:'pic',text:'图片',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'券额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'conditionPrice',text:'满多少金额',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'说明',dictCode:''})
+        fieldList.push({type:'datetime',value:'endTime',text:'优惠券结束时间'})
+        fieldList.push({type:'int',value:'type',text:'类型 0指定时间 1单次',dictCode:'coupon_type'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponForm.vue
new file mode 100644
index 0000000..ed732fb
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponForm.vue
@@ -0,0 +1,144 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="优惠券名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入优惠券名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pic">
+              <j-image-upload isMultiple  v-model="model.pic" ></j-image-upload>
+            </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>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="满多少金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionPrice">
+              <a-input-number v-model="model.conditionPrice" placeholder="请输入满多少金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <j-editor v-model="model.info" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="优惠券结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endTime">
+              <j-date placeholder="请选择优惠券结束时间"  v-model="model.endTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="coupon_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'HotelCouponForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            type:0,
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/hotelcoupon/hotelCoupon/add",
+          edit: "/hotelcoupon/hotelCoupon/edit",
+          queryById: "/hotelcoupon/hotelCoupon/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.Style#Drawer.vue
new file mode 100644
index 0000000..298c557
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-coupon-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-coupon-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import HotelCouponForm from './HotelCouponForm'
+
+  export default {
+    name: 'HotelCouponModal',
+    components: {
+      HotelCouponForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.vue
new file mode 100644
index 0000000..1e12f68
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue/modules/HotelCouponModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <hotel-coupon-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-coupon-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelCouponForm from './HotelCouponForm'
+  export default {
+    name: 'HotelCouponModal',
+    components: {
+      HotelCouponForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.api.ts
new file mode 100644
index 0000000..b0f282e
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/hotelcoupon/hotelCoupon/list',
+  save='/hotelcoupon/hotelCoupon/add',
+  edit='/hotelcoupon/hotelCoupon/edit',
+  deleteOne = '/hotelcoupon/hotelCoupon/delete',
+  deleteBatch = '/hotelcoupon/hotelCoupon/deleteBatch',
+  importExcel = '/hotelcoupon/hotelCoupon/importExcel',
+  exportXls = '/hotelcoupon/hotelCoupon/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.data.ts
new file mode 100644
index 0000000..758e3ac
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCoupon.data.ts
@@ -0,0 +1,108 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '优惠券名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '图片',
+    align:"center",
+    dataIndex: 'pic',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '券额',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '满多少金额',
+    align:"center",
+    dataIndex: 'conditionPrice'
+   },
+   {
+    title: '说明',
+    align:"center",
+    dataIndex: 'info',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '优惠券结束时间',
+    align:"center",
+    dataIndex: 'endTime'
+   },
+   {
+    title: '类型 0指定时间 1单次',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '是否删除',
+    align:"center",
+    dataIndex: 'delFlag_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '优惠券名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '图片',
+    field: 'pic',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '券额',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '满多少金额',
+    field: 'conditionPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '说明',
+    field: 'info',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '优惠券结束时间',
+    field: 'endTime',
+    component: 'Input',
+  },
+  {
+    label: '类型 0指定时间 1单次',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"coupon_type"
+     },
+  },
+  {
+    label: '是否删除',
+    field: 'delFlag',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_delete"
+     },
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入是否删除!'},
+          ];
+     },
+  },
+];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCouponList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCouponList.vue
new file mode 100644
index 0000000..961ad3e
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/HotelCouponList.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <HotelCouponModal @register="registerModal" @success="handleSuccess"></HotelCouponModal>
+  </div>
+</template>
+
+<script lang="ts" name="hotelcoupon-hotelCoupon" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import HotelCouponModal from './components/HotelCouponModal.vue'
+  import {columns, searchFormSchema} from './hotelCoupon.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './hotelCoupon.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'hotel_coupon',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"hotel_coupon",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/components/HotelCouponModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/components/HotelCouponModal.vue
new file mode 100644
index 0000000..29324db
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcoupon/vue3/components/HotelCouponModal.vue
@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../hotelCoupon.data';
+    import {saveOrUpdate} from '../hotelCoupon.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/controller/HotelCouponLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/controller/HotelCouponLogController.java
new file mode 100644
index 0000000..fbcb611
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/controller/HotelCouponLogController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.hotelcouponlog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hotelcouponlog.entity.HotelCouponLog;
+import org.jeecg.modules.hotelcouponlog.service.IHotelCouponLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: hotel_coupon_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+@Api(tags="hotel_coupon_log")
+@RestController
+@RequestMapping("/hotelcouponlog/hotelCouponLog")
+@Slf4j
+public class HotelCouponLogController extends JeecgController<HotelCouponLog, IHotelCouponLogService> {
+	@Autowired
+	private IHotelCouponLogService hotelCouponLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param hotelCouponLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_coupon_log-分页列表查询")
+	@ApiOperation(value="hotel_coupon_log-分页列表查询", notes="hotel_coupon_log-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<HotelCouponLog>> queryPageList(HotelCouponLog hotelCouponLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<HotelCouponLog> queryWrapper = QueryGenerator.initQueryWrapper(hotelCouponLog, req.getParameterMap());
+		Page<HotelCouponLog> page = new Page<HotelCouponLog>(pageNo, pageSize);
+		IPage<HotelCouponLog> pageList = hotelCouponLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param hotelCouponLog
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon_log-添加")
+	@ApiOperation(value="hotel_coupon_log-添加", notes="hotel_coupon_log-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody HotelCouponLog hotelCouponLog) {
+		hotelCouponLogService.save(hotelCouponLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param hotelCouponLog
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon_log-编辑")
+	@ApiOperation(value="hotel_coupon_log-编辑", notes="hotel_coupon_log-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody HotelCouponLog hotelCouponLog) {
+		hotelCouponLogService.updateById(hotelCouponLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon_log-通过id删除")
+	@ApiOperation(value="hotel_coupon_log-通过id删除", notes="hotel_coupon_log-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		hotelCouponLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "hotel_coupon_log-批量删除")
+	@ApiOperation(value="hotel_coupon_log-批量删除", notes="hotel_coupon_log-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.hotelCouponLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_coupon_log-通过id查询")
+	@ApiOperation(value="hotel_coupon_log-通过id查询", notes="hotel_coupon_log-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<HotelCouponLog> queryById(@RequestParam(name="id",required=true) String id) {
+		HotelCouponLog hotelCouponLog = hotelCouponLogService.getById(id);
+		if(hotelCouponLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(hotelCouponLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param hotelCouponLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HotelCouponLog hotelCouponLog) {
+        return super.exportXls(request, hotelCouponLog, HotelCouponLog.class, "hotel_coupon_log");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HotelCouponLog.class);
+    }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/entity/HotelCouponLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/entity/HotelCouponLog.java
new file mode 100644
index 0000000..9564eef
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/entity/HotelCouponLog.java
@@ -0,0 +1,97 @@
+package org.jeecg.modules.hotelcouponlog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: hotel_coupon_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("hotel_coupon_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="hotel_coupon_log对象", description="hotel_coupon_log")
+public class HotelCouponLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**优惠券编号*/
+	@Excel(name = "优惠券编号", width = 15)
+    @ApiModelProperty(value = "优惠券编号")
+    private java.lang.String couponId;
+	/**用户编号*/
+	@Excel(name = "用户编号", width = 15)
+    @ApiModelProperty(value = "用户编号")
+    private java.lang.String userId;
+	/**优惠券名*/
+	@Excel(name = "优惠券名", width = 15)
+    @ApiModelProperty(value = "优惠券名")
+    private java.lang.String couponName;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String pic;
+	/**券额*/
+	@Excel(name = "券额", width = 15)
+    @ApiModelProperty(value = "券额")
+    private java.math.BigDecimal price;
+	/**满足多少金额*/
+	@Excel(name = "满足多少金额", width = 15)
+    @ApiModelProperty(value = "满足多少金额")
+    private java.math.BigDecimal conditionPrice;
+	/**结束时间*/
+	@Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "结束时间")
+    private java.util.Date endTime;
+	/**类型 0指定时间 1单次使用*/
+	@Excel(name = "类型 0指定时间 1单次使用", width = 15, dicCode = "coupon_type")
+	@Dict(dicCode = "coupon_type")
+    @ApiModelProperty(value = "类型 0指定时间 1单次使用")
+    private java.lang.Integer type;
+	/**状态 0未使用 1已使用*/
+	@Excel(name = "状态 0未使用 1已使用", width = 15, dicCode = "coupon_log_status")
+	@Dict(dicCode = "coupon_log_status")
+    @ApiModelProperty(value = "状态 0未使用 1已使用")
+    private java.lang.Integer status;
+	/**是否删除*/
+	@Excel(name = "是否删除", width = 15, dicCode = "is_delete")
+	@Dict(dicCode = "is_delete")
+    @ApiModelProperty(value = "是否删除")
+    private java.lang.Integer delFlag;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /**使用类型 0押金 1租金 2水洗*/
+    @Dict(dicCode = "coupon_use_type")
+    private Integer useType;
+    private String orderLogId;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/HotelCouponLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/HotelCouponLogMapper.java
new file mode 100644
index 0000000..b5fab92
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/HotelCouponLogMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.hotelcouponlog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.hotelcouponlog.entity.HotelCouponLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: hotel_coupon_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+public interface HotelCouponLogMapper extends BaseMapper<HotelCouponLog> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/xml/HotelCouponLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/xml/HotelCouponLogMapper.xml
new file mode 100644
index 0000000..a80a9f0
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/mapper/xml/HotelCouponLogMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.hotelcouponlog.mapper.HotelCouponLogMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/IHotelCouponLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/IHotelCouponLogService.java
new file mode 100644
index 0000000..f42446c
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/IHotelCouponLogService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.hotelcouponlog.service;
+
+import org.jeecg.modules.hotelcouponlog.entity.HotelCouponLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: hotel_coupon_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+public interface IHotelCouponLogService extends IService<HotelCouponLog> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/impl/HotelCouponLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/impl/HotelCouponLogServiceImpl.java
new file mode 100644
index 0000000..8c89749
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/service/impl/HotelCouponLogServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.hotelcouponlog.service.impl;
+
+import org.jeecg.modules.hotelcouponlog.entity.HotelCouponLog;
+import org.jeecg.modules.hotelcouponlog.mapper.HotelCouponLogMapper;
+import org.jeecg.modules.hotelcouponlog.service.IHotelCouponLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: hotel_coupon_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-14
+ * @Version: V1.0
+ */
+@Service
+public class HotelCouponLogServiceImpl extends ServiceImpl<HotelCouponLogMapper, HotelCouponLog> implements IHotelCouponLogService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/HotelCouponLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/HotelCouponLogList.vue
new file mode 100644
index 0000000..e956c8e
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/HotelCouponLogList.vue
@@ -0,0 +1,232 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_coupon_log')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-coupon-log-modal ref="modalForm" @ok="modalFormOk"></hotel-coupon-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelCouponLogModal from './modules/HotelCouponLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'HotelCouponLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelCouponLogModal
+    },
+    data () {
+      return {
+        description: 'hotel_coupon_log管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'优惠券编号',
+            align:"center",
+            dataIndex: 'couponId'
+          },
+          {
+            title:'用户编号',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'优惠券名',
+            align:"center",
+            dataIndex: 'couponName'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'券额',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'满足多少金额',
+            align:"center",
+            dataIndex: 'conditionPrice'
+          },
+          {
+            title:'结束时间',
+            align:"center",
+            dataIndex: 'endTime'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'使用类型',
+            align:"center",
+            dataIndex: 'useType_dictText'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelcouponlog/hotelCouponLog/list",
+          delete: "/hotelcouponlog/hotelCouponLog/delete",
+          deleteBatch: "/hotelcouponlog/hotelCouponLog/deleteBatch",
+          exportXlsUrl: "/hotelcouponlog/hotelCouponLog/exportXls",
+          importExcelUrl: "hotelcouponlog/hotelCouponLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'couponId',text:'优惠券编号',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
+        fieldList.push({type:'string',value:'couponName',text:'优惠券名',dictCode:''})
+        fieldList.push({type:'string',value:'pic',text:'图片',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'券额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'conditionPrice',text:'满足多少金额',dictCode:''})
+        fieldList.push({type:'datetime',value:'endTime',text:'结束时间'})
+        fieldList.push({type:'int',value:'type',text:'类型 0指定时间 1单次使用',dictCode:'coupon_type'})
+        fieldList.push({type:'int',value:'status',text:'状态 0未使用 1已使用',dictCode:'coupon_log_status'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogForm.vue
new file mode 100644
index 0000000..9d1c2cc
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogForm.vue
@@ -0,0 +1,163 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="优惠券编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="couponId">
+              <a-input v-model="model.couponId" placeholder="请输入优惠券编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="优惠券名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="couponName">
+              <a-input v-model="model.couponName" placeholder="请输入优惠券名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pic">
+              <j-image-upload isMultiple  v-model="model.pic" ></j-image-upload>
+            </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>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="满足多少金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionPrice">
+              <a-input-number v-model="model.conditionPrice" placeholder="请输入满足多少金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endTime">
+              <j-date placeholder="请选择结束时间"  v-model="model.endTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="coupon_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="使用类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useType">
+              <j-dict-select-tag type="list" v-model="model.useType" dictCode="coupon_type" placeholder="请选择使用类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="radio" v-model="model.status" dictCode="coupon_log_status" placeholder="请选择状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'HotelCouponLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            type:0,
+            status:0,
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           status: [
+              { required: true, message: '请输入状态 0未使用 1已使用!'},
+           ],
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/hotelcouponlog/hotelCouponLog/add",
+          edit: "/hotelcouponlog/hotelCouponLog/edit",
+          queryById: "/hotelcouponlog/hotelCouponLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.Style#Drawer.vue
new file mode 100644
index 0000000..304ad04
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-coupon-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-coupon-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import HotelCouponLogForm from './HotelCouponLogForm'
+
+  export default {
+    name: 'HotelCouponLogModal',
+    components: {
+      HotelCouponLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.vue
new file mode 100644
index 0000000..1432440
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue/modules/HotelCouponLogModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <hotel-coupon-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-coupon-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelCouponLogForm from './HotelCouponLogForm'
+  export default {
+    name: 'HotelCouponLogModal',
+    components: {
+      HotelCouponLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.api.ts
new file mode 100644
index 0000000..3be3936
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/hotelcouponlog/hotelCouponLog/list',
+  save='/hotelcouponlog/hotelCouponLog/add',
+  edit='/hotelcouponlog/hotelCouponLog/edit',
+  deleteOne = '/hotelcouponlog/hotelCouponLog/delete',
+  deleteBatch = '/hotelcouponlog/hotelCouponLog/deleteBatch',
+  importExcel = '/hotelcouponlog/hotelCouponLog/importExcel',
+  exportXls = '/hotelcouponlog/hotelCouponLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.data.ts
new file mode 100644
index 0000000..83881c1
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLog.data.ts
@@ -0,0 +1,135 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '优惠券编号',
+    align:"center",
+    dataIndex: 'couponId'
+   },
+   {
+    title: '用户编号',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '优惠券名',
+    align:"center",
+    dataIndex: 'couponName'
+   },
+   {
+    title: '图片',
+    align:"center",
+    dataIndex: 'pic',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '券额',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '满足多少金额',
+    align:"center",
+    dataIndex: 'conditionPrice'
+   },
+   {
+    title: '结束时间',
+    align:"center",
+    dataIndex: 'endTime'
+   },
+   {
+    title: '类型 0指定时间 1单次使用',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '状态 0未使用 1已使用',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
+   {
+    title: '是否删除',
+    align:"center",
+    dataIndex: 'delFlag_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '优惠券编号',
+    field: 'couponId',
+    component: 'Input',
+  },
+  {
+    label: '用户编号',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '优惠券名',
+    field: 'couponName',
+    component: 'Input',
+  },
+  {
+    label: '图片',
+    field: 'pic',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '券额',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '满足多少金额',
+    field: 'conditionPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    component: 'Input',
+  },
+  {
+    label: '类型 0指定时间 1单次使用',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"coupon_type"
+     },
+  },
+  {
+    label: '状态 0未使用 1已使用',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"coupon_log_status"
+     },
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入状态 0未使用 1已使用!'},
+          ];
+     },
+  },
+  {
+    label: '是否删除',
+    field: 'delFlag',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_delete"
+     },
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入是否删除!'},
+          ];
+     },
+  },
+];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLogList.vue
new file mode 100644
index 0000000..0991f3e
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/HotelCouponLogList.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <HotelCouponLogModal @register="registerModal" @success="handleSuccess"></HotelCouponLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="hotelcouponlog-hotelCouponLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import HotelCouponLogModal from './components/HotelCouponLogModal.vue'
+  import {columns, searchFormSchema} from './hotelCouponLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './hotelCouponLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'hotel_coupon_log',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"hotel_coupon_log",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/components/HotelCouponLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/components/HotelCouponLogModal.vue
new file mode 100644
index 0000000..923b30f
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcouponlog/vue3/components/HotelCouponLogModal.vue
@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../hotelCouponLog.data';
+    import {saveOrUpdate} from '../hotelCouponLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/controller/HotelOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/controller/HotelOrderController.java
index 8c72670..70dfd55 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/controller/HotelOrderController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/controller/HotelOrderController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.hotelorder.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -7,12 +8,22 @@ import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hotelbalancelog.entity.HotelBalanceLog;
+import org.jeecg.modules.hotelbalancelog.service.IHotelBalanceLogService;
+import org.jeecg.modules.hotelconf.service.IHotelConfService;
+import org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
+import org.jeecg.modules.hotelleaselog.service.IHotelLeaseLogService;
+import org.jeecg.modules.hotelmemberaccount.entity.HotelMemberAccount;
+import org.jeecg.modules.hotelmemberaccount.service.IHotelMemberAccountService;
 import org.jeecg.modules.hotelorder.entity.HotelOrder;
+import org.jeecg.modules.hotelorder.req.DamageAuditReq;
 import org.jeecg.modules.hotelorder.service.IHotelOrderService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +31,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.hotelshop.entity.HotelShop;
+import org.jeecg.modules.hotelshop.service.IHotelShopService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -27,6 +40,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -49,6 +63,16 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class HotelOrderController extends JeecgController<HotelOrder, IHotelOrderService> {
 	@Autowired
 	private IHotelOrderService hotelOrderService;
+	@Resource
+	private IHotelShopService hotelShopService;
+	@Resource
+	private IHotelMemberAccountService hotelMemberAccountService;
+	@Resource
+	private IHotelConfService hotelConfService;
+	@Resource
+	private IHotelBalanceLogService hotelBalanceLogService;
+	@Resource
+	private IHotelLeaseLogService hotelLeaseLogService;
 	
 	/**
 	 * 分页列表查询
@@ -71,6 +95,75 @@ public class HotelOrderController extends JeecgController<HotelOrder, IHotelOrde
 		IPage<HotelOrder> pageList = hotelOrderService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+
+	 /**
+	  * 水洗分页列表查询
+	  *
+	  * @param hotelOrder
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "hotel_order-分页列表查询")
+	 @ApiOperation(value="水洗分页列表查询", notes="水洗分页列表查询")
+	 @GetMapping(value = "/wash/list")
+	 public Result<IPage<HotelOrder>> queryPageWashList(HotelOrder hotelOrder,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 QueryWrapper<HotelOrder> queryWrapper = QueryGenerator.initQueryWrapper(hotelOrder, req.getParameterMap());
+		 queryWrapper.eq("type",1);
+		 Page<HotelOrder> page = new Page<HotelOrder>(pageNo, pageSize);
+		 IPage<HotelOrder> pageList = hotelOrderService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 换货分页列表查询
+	  *
+	  * @param hotelOrder
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "hotel_order-分页列表查询")
+	 @ApiOperation(value="换货分页列表查询", notes="换货分页列表查询")
+	 @GetMapping(value = "/replace/list")
+	 public Result<IPage<HotelOrder>> queryPageReplaceList(HotelOrder hotelOrder,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		 QueryWrapper<HotelOrder> queryWrapper = QueryGenerator.initQueryWrapper(hotelOrder, req.getParameterMap());
+		 queryWrapper.eq("type",2);
+		 Page<HotelOrder> page = new Page<HotelOrder>(pageNo, pageSize);
+		 IPage<HotelOrder> pageList = hotelOrderService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 退货分页列表查询
+	  *
+	  * @param hotelOrder
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "hotel_order-分页列表查询")
+	 @ApiOperation(value="退货分页列表查询", notes="退货分页列表查询")
+	 @GetMapping(value = "/refund/list")
+	 public Result<IPage<HotelOrder>> queryPageRefundList(HotelOrder hotelOrder,
+														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														   HttpServletRequest req) {
+		 QueryWrapper<HotelOrder> queryWrapper = QueryGenerator.initQueryWrapper(hotelOrder, req.getParameterMap());
+		 queryWrapper.eq("type",3);
+		 Page<HotelOrder> page = new Page<HotelOrder>(pageNo, pageSize);
+		 IPage<HotelOrder> pageList = hotelOrderService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
 	
 	/**
 	 *   添加
@@ -168,4 +261,131 @@ public class HotelOrderController extends JeecgController<HotelOrder, IHotelOrde
         return super.importExcel(request, response, HotelOrder.class);
     }
 
+
+	 /**
+	  *  水洗破损上报审核
+	  *
+	  * @param hotelOrder3
+	  * @return
+	  */
+	 @Transactional(rollbackFor = Exception.class)
+	 @AutoLog(value = "水洗破损上报审核")
+	 @ApiOperation(value="水洗破损上报审核", notes="水洗破损上报审核")
+	 @RequestMapping(value = "/damage/audit", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> damageAudit(@RequestBody HotelOrder hotelOrder3) {
+		 HotelOrder hotelOrder = new HotelOrder();
+		 hotelOrder.setId(hotelOrder3.getId());
+
+		 HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery()
+				 .eq(HotelLeaseLog::getDelFlag, 0)
+				 .eq(HotelLeaseLog::getId, hotelOrder3.getLeaseId())
+				 .one();
+
+		 HotelShop hotelShop = hotelShopService.lambdaQuery()
+				 .eq(HotelShop::getDelFlag, 0)
+				 .eq(HotelShop::getUserId, hotelOrder3.getShopId())
+				 .one();
+		 HotelLeaseLog hotelLeaseLog2 = new HotelLeaseLog();
+		 if(hotelOrder3.getAudit() == 0){
+		 	if(hotelOrder3.getNum() > hotelOrder3.getRefundNum()){
+				hotelOrder.setStatus(6);
+
+
+
+				hotelLeaseLog2.setUserId(hotelLeaseLog.getUserId());
+				hotelLeaseLog2.setShopId(hotelLeaseLog.getShopId());
+				hotelLeaseLog2.setOrderId(hotelLeaseLog.getOrderId());
+				hotelLeaseLog2.setGoodsId(hotelLeaseLog.getGoodsId());
+				hotelLeaseLog2.setSkuId(hotelLeaseLog.getSkuId());
+				hotelLeaseLog2.setGoodsName(hotelLeaseLog.getGoodsName());
+				hotelLeaseLog2.setGoodsPic(hotelLeaseLog.getGoodsPic());
+				hotelLeaseLog2.setSku(hotelLeaseLog.getSku());
+				hotelLeaseLog2.setStatus(1);
+				hotelLeaseLog2.setNum(hotelOrder3.getRefundNum());
+				hotelLeaseLog2.setPrice(hotelLeaseLog.getPrice());
+				hotelLeaseLog2.setCategoryId(hotelLeaseLog.getCategoryId());
+				hotelLeaseLogService.save(hotelLeaseLog2);
+
+				HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
+				hotelLeaseLog1.setId(hotelLeaseLog.getId());
+				hotelLeaseLog1.setNum(hotelLeaseLog.getNum()-hotelOrder3.getRefundNum());
+				hotelLeaseLogService.updateById(hotelLeaseLog1);
+
+
+
+
+
+			}else{
+
+
+				HotelMemberAccount hotelMemberAccount = hotelMemberAccountService.lambdaQuery()
+						.eq(HotelMemberAccount::getDelFlag, 0)
+						.eq(HotelMemberAccount::getUserId, hotelShop.getUserId())
+						.one();
+
+
+				BigDecimal platformServiceRate = new BigDecimal(hotelConfService.getConf("platformServiceRate"));
+				BigDecimal platformServicePrice = hotelOrder.getOrderPay().multiply(platformServiceRate);
+				BigDecimal shopPrice = hotelOrder.getOrderPay().multiply(hotelShop.getRate());
+				BigDecimal price = hotelMemberAccount.getShopBalance().add(shopPrice);
+
+
+				HotelMemberAccount hotelMemberAccount1 = new HotelMemberAccount();
+				hotelMemberAccount1.setId(hotelMemberAccount.getId());
+				hotelMemberAccount1.setShopBalance(price);
+				hotelMemberAccountService.updateById(hotelMemberAccount1);
+
+
+				HotelBalanceLog hotelBalanceLog = new HotelBalanceLog();
+				hotelBalanceLog.setUserId(hotelShop.getUserId());
+				hotelBalanceLog.setBalance(shopPrice);
+				hotelBalanceLog.setUserBalance(hotelMemberAccount.getShopBalance());
+				hotelBalanceLog.setType(2);
+				hotelBalanceLog.setTitle("佣金到账");
+				hotelBalanceLog.setPayType(1);
+				hotelBalanceLog.setPlatformServicePrice(platformServicePrice);
+				hotelBalanceLog.setOrderId(hotelOrder3.getId());
+				hotelBalanceLogService.save(hotelBalanceLog);
+
+
+
+				HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
+				hotelLeaseLog1.setId(hotelLeaseLog.getId());
+				hotelLeaseLog1.setStatus(1);
+				hotelLeaseLogService.updateById(hotelLeaseLog1);
+
+
+				hotelOrder.setStatus(15);
+			}
+
+			 HotelOrder hotelOrder1 = new HotelOrder();
+			 hotelOrder1.setReason(hotelOrder3.getReason());
+			 hotelOrder1.setRefundNum(hotelOrder3.getRefundNum());
+			 hotelOrder1.setReasonPrice(hotelOrder3.getReasonPrice());
+			 hotelOrder1.setType(2);
+			 hotelOrder1.setReasonInfo(hotelOrder3.getReasonInfo());
+			 hotelOrder1.setReasonPic(hotelOrder3.getReasonPic());
+			 hotelOrder1.setReasonPhone(hotelOrder3.getReasonPhone());
+			 hotelOrder1.setUserId(hotelOrder3.getUserId());
+			 hotelOrder1.setShopId(hotelLeaseLog.getShopId());
+			 hotelOrder1.setGoodsId(hotelLeaseLog.getGoodsId());
+			 hotelOrder1.setGoodsName(hotelLeaseLog.getGoodsName());
+			 hotelOrder1.setSkuId(hotelLeaseLog.getSkuId());
+			 hotelOrder1.setSku(hotelLeaseLog.getSku());
+			 hotelOrder1.setPic(hotelLeaseLog.getGoodsPic());
+			 hotelOrder1.setStatus(7);
+			 hotelOrder1.setLeaseId(hotelOrder3.getNum() > hotelOrder3.getRefundNum()?hotelLeaseLog2.getId():hotelLeaseLog.getId());
+			 hotelOrder1.setUserName(hotelShop.getUserName());
+			 hotelOrder1.setUserPhone(hotelShop.getPhone());
+			 hotelOrder1.setUserAddress(hotelShop.getAddress());
+			 hotelOrder1.setShopId(hotelShop.getUserId());
+			 hotelOrderService.save(hotelOrder1);
+
+		 }else{
+			 hotelOrder.setStatus(5);
+		 }
+		 hotelOrderService.updateById(hotelOrder);
+		 return Result.OK("编辑成功!");
+	 }
+
 }
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 64b3413..dcae5d0 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
@@ -111,7 +111,7 @@ public class HotelOrder implements Serializable {
     @ApiModelProperty(value = "状态 \n" +
 			"租赁订单：0待支付 1待发货 2待收货  \n" +
 			"水洗订单：3待支付 4水洗店接单 5水洗店检查\n" +
-			"6开始清洗 \n" +
+			"6开始清洗  16 待平台审核\n" +
 			"换货订单：7待回收 8待发货 9平台待收货\n" +
 			"10平台检查损失待用户支付\n" +
 			"退货订单：11待回收 12待发货 13平台待收货\n" +
@@ -175,5 +175,7 @@ public class HotelOrder implements Serializable {
 	private String LeaseId;
 	@TableField(exist = false)
 	private List<HotelOrderFlow> hotelOrderFlows;
+	@TableField(exist = false)
+	private Integer audit;
 
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/req/DamageAuditReq.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/req/DamageAuditReq.java
new file mode 100644
index 0000000..4a14e4e
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/req/DamageAuditReq.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.hotelorder.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.hotelorder.entity.HotelOrder;
+
+@Data
+public class DamageAuditReq {
+
+    /**审核 0通过 1不通过*/
+    private Integer audit;
+    private HotelOrder hotelOrder;
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/controller/HotelShopController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/controller/HotelShopController.java
index 9124ab0..653046d 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/controller/HotelShopController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/controller/HotelShopController.java
@@ -22,6 +22,7 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.hotelmemberaccount.entity.HotelMemberAccount;
 import org.jeecg.modules.hotelmemberaccount.service.IHotelMemberAccountService;
 import org.jeecg.modules.hotelshop.entity.HotelShop;
+import org.jeecg.modules.hotelshop.req.AuditShopReq;
 import org.jeecg.modules.hotelshop.service.IHotelShopService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,6 +30,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.hotelshoplog.entity.HotelShopLog;
+import org.jeecg.modules.hotelshoplog.service.IHotelShopLogService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -62,6 +65,8 @@ public class HotelShopController extends JeecgController<HotelShop, IHotelShopSe
 	private IHanHaiMemberService hanHaiMemberService;
 	@Resource
 	private IHotelMemberAccountService hotelMemberAccountService;
+	@Resource
+	private IHotelShopLogService hotelShopLogService;
 	
 	/**
 	 * 分页列表查询
@@ -208,4 +213,53 @@ public class HotelShopController extends JeecgController<HotelShop, IHotelShopSe
         return super.importExcel(request, response, HotelShop.class);
     }
 
+
+	 /**
+	  *  审核
+	  *
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "hotel_shop-审核")
+	 @RequestMapping(value = "/audit", method = {RequestMethod.POST})
+	 public Result<String> audit(@RequestBody AuditShopReq auditShopReq) {
+		 HotelShop hotelShop = hotelShopService.lambdaQuery()
+				 .eq(HotelShop::getId, auditShopReq.getId())
+				 .one();
+
+		 HanHaiMember haiMember = hanHaiMemberService.lambdaQuery()
+				 .eq(HanHaiMember::getId, hotelShop.getUserId())
+				 .one();
+
+		 HotelMemberAccount hotelMemberAccount1 = hotelMemberAccountService.lambdaQuery()
+				 .eq(HotelMemberAccount::getDelFlag, 0)
+				 .eq(HotelMemberAccount::getUserId, haiMember.getId())
+				 .one();
+
+		 HotelShop hotelShop1 = new HotelShop();
+		 hotelShop1.setId(hotelShop.getId());
+		 if(auditShopReq.getAudit() == 0){
+		 	String uid = IdWorker.getIdStr();
+			 hotelShop1.setUserId(uid);
+			 hotelShop1.setNewId(uid);
+			 hotelShop1.setStatus(1);
+
+			 hanHaiMemberService.updateUserId(haiMember.getId(),uid);
+			 HotelMemberAccount hotelMemberAccount = new HotelMemberAccount();
+			 hotelMemberAccount.setId(hotelMemberAccount1.getId());
+			 hotelMemberAccount.setUserId(uid);
+			 hotelMemberAccountService.updateById(hotelMemberAccount);
+
+			 HotelShopLog hotelShopLog = new HotelShopLog();
+			 hotelShopLog.setOldId(haiMember.getId());
+			 hotelShopLog.setNewId(uid);
+			 hotelShopLog.setShopId(hotelShop.getId());
+			 hotelShopLogService.save(hotelShopLog);
+
+		 }else{
+			 hotelShop1.setStatus(2);
+		 }
+		 hotelShopService.updateById(hotelShop1);
+		 return Result.OK("成功!");
+	 }
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java
index 40e5327..c82eff5 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java
@@ -99,4 +99,8 @@ public class HotelShop implements Serializable {
 	private BigDecimal rate;
 	@TableField(exist = false)
 	private String password;
+	/**酒店用户id*/
+	private String oldId;
+	/**水洗店用户id*/
+	private String newId;
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/req/AuditShopReq.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/req/AuditShopReq.java
new file mode 100644
index 0000000..bc4507f
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/req/AuditShopReq.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.hotelshop.req;
+
+import lombok.Data;
+
+@Data
+public class AuditShopReq {
+
+    /**店铺id*/
+    private String id;
+    /**0审核通过 1审核不通过*/
+    private Integer audit;
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/controller/HotelShopLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/controller/HotelShopLogController.java
new file mode 100644
index 0000000..a3f6a15
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/controller/HotelShopLogController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.hotelshoplog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hotelshoplog.entity.HotelShopLog;
+import org.jeecg.modules.hotelshoplog.service.IHotelShopLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: hotel_shop_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-12
+ * @Version: V1.0
+ */
+@Api(tags="hotel_shop_log")
+@RestController
+@RequestMapping("/hotelshoplog/hotelShopLog")
+@Slf4j
+public class HotelShopLogController extends JeecgController<HotelShopLog, IHotelShopLogService> {
+	@Autowired
+	private IHotelShopLogService hotelShopLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param hotelShopLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_shop_log-分页列表查询")
+	@ApiOperation(value="hotel_shop_log-分页列表查询", notes="hotel_shop_log-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<HotelShopLog>> queryPageList(HotelShopLog hotelShopLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<HotelShopLog> queryWrapper = QueryGenerator.initQueryWrapper(hotelShopLog, req.getParameterMap());
+		Page<HotelShopLog> page = new Page<HotelShopLog>(pageNo, pageSize);
+		IPage<HotelShopLog> pageList = hotelShopLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param hotelShopLog
+	 * @return
+	 */
+	@AutoLog(value = "hotel_shop_log-添加")
+	@ApiOperation(value="hotel_shop_log-添加", notes="hotel_shop_log-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody HotelShopLog hotelShopLog) {
+		hotelShopLogService.save(hotelShopLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param hotelShopLog
+	 * @return
+	 */
+	@AutoLog(value = "hotel_shop_log-编辑")
+	@ApiOperation(value="hotel_shop_log-编辑", notes="hotel_shop_log-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody HotelShopLog hotelShopLog) {
+		hotelShopLogService.updateById(hotelShopLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "hotel_shop_log-通过id删除")
+	@ApiOperation(value="hotel_shop_log-通过id删除", notes="hotel_shop_log-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		hotelShopLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "hotel_shop_log-批量删除")
+	@ApiOperation(value="hotel_shop_log-批量删除", notes="hotel_shop_log-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.hotelShopLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_shop_log-通过id查询")
+	@ApiOperation(value="hotel_shop_log-通过id查询", notes="hotel_shop_log-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<HotelShopLog> queryById(@RequestParam(name="id",required=true) String id) {
+		HotelShopLog hotelShopLog = hotelShopLogService.getById(id);
+		if(hotelShopLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(hotelShopLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param hotelShopLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HotelShopLog hotelShopLog) {
+        return super.exportXls(request, hotelShopLog, HotelShopLog.class, "hotel_shop_log");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HotelShopLog.class);
+    }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/entity/HotelShopLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/entity/HotelShopLog.java
new file mode 100644
index 0000000..78d2c59
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/entity/HotelShopLog.java
@@ -0,0 +1,65 @@
+package org.jeecg.modules.hotelshoplog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: hotel_shop_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("hotel_shop_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="hotel_shop_log对象", description="hotel_shop_log")
+public class HotelShopLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**老用户id*/
+	@Excel(name = "老用户id", width = 15)
+    @ApiModelProperty(value = "老用户id")
+    private java.lang.String oldId;
+	/**新用户Id*/
+	@Excel(name = "新用户Id", width = 15)
+    @ApiModelProperty(value = "新用户Id")
+    private java.lang.String newId;
+	/**水洗店id*/
+	@Excel(name = "水洗店id", width = 15)
+    @ApiModelProperty(value = "水洗店id")
+    private java.lang.String shopId;
+	/**是否删除*/
+	@Excel(name = "是否删除", width = 15, dicCode = "is_delete")
+	@Dict(dicCode = "is_delete")
+    @ApiModelProperty(value = "是否删除")
+    private java.lang.Integer delFlag;
+	/**createTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "createTime")
+    private java.util.Date createTime;
+	/**updateTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "updateTime")
+    private java.util.Date updateTime;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/HotelShopLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/HotelShopLogMapper.java
new file mode 100644
index 0000000..b88503b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/HotelShopLogMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.hotelshoplog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.hotelshoplog.entity.HotelShopLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: hotel_shop_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-12
+ * @Version: V1.0
+ */
+public interface HotelShopLogMapper extends BaseMapper<HotelShopLog> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/xml/HotelShopLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/xml/HotelShopLogMapper.xml
new file mode 100644
index 0000000..823b63b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/mapper/xml/HotelShopLogMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.hotelshoplog.mapper.HotelShopLogMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/IHotelShopLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/IHotelShopLogService.java
new file mode 100644
index 0000000..b45db64
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/IHotelShopLogService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.hotelshoplog.service;
+
+import org.jeecg.modules.hotelshoplog.entity.HotelShopLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: hotel_shop_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-12
+ * @Version: V1.0
+ */
+public interface IHotelShopLogService extends IService<HotelShopLog> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/impl/HotelShopLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/impl/HotelShopLogServiceImpl.java
new file mode 100644
index 0000000..6bdb5ee
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/service/impl/HotelShopLogServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.hotelshoplog.service.impl;
+
+import org.jeecg.modules.hotelshoplog.entity.HotelShopLog;
+import org.jeecg.modules.hotelshoplog.mapper.HotelShopLogMapper;
+import org.jeecg.modules.hotelshoplog.service.IHotelShopLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: hotel_shop_log
+ * @Author: jeecg-boot
+ * @Date:   2024-10-12
+ * @Version: V1.0
+ */
+@Service
+public class HotelShopLogServiceImpl extends ServiceImpl<HotelShopLogMapper, HotelShopLog> implements IHotelShopLogService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/HotelShopLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/HotelShopLogList.vue
new file mode 100644
index 0000000..885f26b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/HotelShopLogList.vue
@@ -0,0 +1,190 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('hotel_shop_log')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <hotel-shop-log-modal ref="modalForm" @ok="modalFormOk"></hotel-shop-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelShopLogModal from './modules/HotelShopLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'HotelShopLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelShopLogModal
+    },
+    data () {
+      return {
+        description: 'hotel_shop_log管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'老用户id',
+            align:"center",
+            dataIndex: 'oldId'
+          },
+          {
+            title:'新用户Id',
+            align:"center",
+            dataIndex: 'newId'
+          },
+          {
+            title:'水洗店id',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelshoplog/hotelShopLog/list",
+          delete: "/hotelshoplog/hotelShopLog/delete",
+          deleteBatch: "/hotelshoplog/hotelShopLog/deleteBatch",
+          exportXlsUrl: "/hotelshoplog/hotelShopLog/exportXls",
+          importExcelUrl: "hotelshoplog/hotelShopLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'oldId',text:'老用户id',dictCode:''})
+        fieldList.push({type:'string',value:'newId',text:'新用户Id',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'水洗店id',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogForm.vue
new file mode 100644
index 0000000..de4a73b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogForm.vue
@@ -0,0 +1,120 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="老用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldId">
+              <a-input v-model="model.oldId" placeholder="请输入老用户id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="新用户Id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newId">
+              <a-input v-model="model.newId" placeholder="请输入新用户Id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="水洗店id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入水洗店id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'HotelShopLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/hotelshoplog/hotelShopLog/add",
+          edit: "/hotelshoplog/hotelShopLog/edit",
+          queryById: "/hotelshoplog/hotelShopLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.Style#Drawer.vue
new file mode 100644
index 0000000..40d86a6
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-shop-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-shop-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import HotelShopLogForm from './HotelShopLogForm'
+
+  export default {
+    name: 'HotelShopLogModal',
+    components: {
+      HotelShopLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.vue
new file mode 100644
index 0000000..7eefa6f
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue/modules/HotelShopLogModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <hotel-shop-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-shop-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelShopLogForm from './HotelShopLogForm'
+  export default {
+    name: 'HotelShopLogModal',
+    components: {
+      HotelShopLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.api.ts
new file mode 100644
index 0000000..c449109
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/hotelshoplog/hotelShopLog/list',
+  save='/hotelshoplog/hotelShopLog/add',
+  edit='/hotelshoplog/hotelShopLog/edit',
+  deleteOne = '/hotelshoplog/hotelShopLog/delete',
+  deleteBatch = '/hotelshoplog/hotelShopLog/deleteBatch',
+  importExcel = '/hotelshoplog/hotelShopLog/importExcel',
+  exportXls = '/hotelshoplog/hotelShopLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.data.ts
new file mode 100644
index 0000000..2e2f1d5
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLog.data.ts
@@ -0,0 +1,56 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '老用户id',
+    align:"center",
+    dataIndex: 'oldId'
+   },
+   {
+    title: '新用户Id',
+    align:"center",
+    dataIndex: 'newId'
+   },
+   {
+    title: '水洗店id',
+    align:"center",
+    dataIndex: 'shopId'
+   },
+   {
+    title: '是否删除',
+    align:"center",
+    dataIndex: 'delFlag_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '老用户id',
+    field: 'oldId',
+    component: 'Input',
+  },
+  {
+    label: '新用户Id',
+    field: 'newId',
+    component: 'Input',
+  },
+  {
+    label: '水洗店id',
+    field: 'shopId',
+    component: 'Input',
+  },
+  {
+    label: '是否删除',
+    field: 'delFlag',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_delete"
+     },
+  },
+];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLogList.vue
new file mode 100644
index 0000000..701f3e2
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/HotelShopLogList.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <HotelShopLogModal @register="registerModal" @success="handleSuccess"></HotelShopLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="hotelshoplog-hotelShopLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import HotelShopLogModal from './components/HotelShopLogModal.vue'
+  import {columns, searchFormSchema} from './hotelShopLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './hotelShopLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'hotel_shop_log',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"hotel_shop_log",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/components/HotelShopLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/components/HotelShopLogModal.vue
new file mode 100644
index 0000000..3f0963e
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoplog/vue3/components/HotelShopLogModal.vue
@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../hotelShopLog.data';
+    import {saveOrUpdate} from '../hotelShopLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroConfig.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroConfig.class
index d6af4af37efd8e79ebb6632048f5a881c23e3506..f77cfc1b55565a0c390f73cbc6d0c521b54e307c 100644
GIT binary patch
delta 3297
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
XVQiCR0!ZiMvLR4#J}f>#k5B#=dNSlw

delta 3226
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
b9V=gTP1g*~fp`yR2}7{pZ0MZBxqS7%mJ8(B

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.class
index 7e67865700e4344cd43b630f0f097ac578be3cdd..de94076fa9b094fef90a44fe74903c276e6e98b7 100644
GIT binary patch
delta 164
zcmZ3^v5iys)W2Q(7#J8#7^K-5B-j}w*%_oZ3g<8h@RSy$B$lLx7N-_@rZ6&CPL^g;
zSI9~%OVrOv%uCnz%qvMvPc5=$WMIwDNdc)~%}XucT+L*}$jCf-9do)H3nPOdgAfA~
t0~^qIP9_FnASD9C+(0bO#K6eF1H`<=Kyf%z1gM%5D9ywm${+@&#Q`Xy93B7w

delta 58
zcmdnSxtv4z)W2Q(7#J8#7{u8bMA#Wb*%`z(3g<9wzQv@+$jCIAlO<h<fr)_=sDz0@
KkU<Dc3j+X)xCycV

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml
index fcaf936..28e546b 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml
@@ -9,10 +9,14 @@
 
     <select id="getShopIndex" resultType="org.jeecg.modules.hanHaiMember.resp.ShopIndexResp">
         select (select count(1) from han_hai_member where shop_id = #{shopId}) user,
-    (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 0) lease,
-           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 1) wash,
-           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 2) worn,
-           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (0,1,2) and type = 3) refund
+    (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (1,2,15) and type = 0) lease,
+           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (4,5,6,15,16) and type = 1) wash,
+           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (7,8,9,10,15) and type = 2) worn,
+           (select count(1) from hotel_order where shop_id = #{userId} and del_flag = 0 and status in (11,12,13,14,15) and type = 3) refund
     </select>
 
+    <update id="updateUserId">
+        UPDATE han_hai_member SET id = #{newId} WHERE id = #{oldId}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.class
index c9527d25ac2098fc99acbbe3e3a055c040d38e9e..09398f98709a3c8a24340a576a751554257e2d37 100644
GIT binary patch
delta 259
zcmZ3-K8aKK)W2Q(7#J8#7^K-5B-j}w*%_oZ3X3xd@RSy$B$lLx7N-_@rZ6&CPCmw{
zUZ0g%mZ+bTn3t~anOBmUo?2wh$iSMPlLAt~nwMG*qLqS5^GY&vQ^PWgGm~;s0}_i8
zb5l!FiyZUv@=Fp+GV}9_85vZ4@{7{-6AKcPGg9?4lYqj-`iTey`e0ok!^;wLN>dpb
zYJEUfZ#G~uWn^TYoW^YC#=^+J$H33P#J~o0Jtq@`0FV*{Vj&<FXJTMv5C&qAVxTyj
SDF{@}36y4H5M>Yp)8YWxOFeP`

delta 58
zcmbQlxsF}<)W2Q(7#J8#7)00^1lbvc*cpU33X3yszQttC$jCHVjKxfdfr)_=sDz1u
KkAWXd3jhFi-3b!_

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.class
index a035f68d7acb55836ddf53f98178c9334ee3b55d..8ea57801b5b6fce85a464a13e4edf52bb6aceaf2 100644
GIT binary patch
delta 600
zcmaJ-%Sr-a7(M@t<2X8{UF>3(nx&=IbXycITZB*qK@TwC5JXs*)iQhpnN^#hH?Rvt
zEy8tA5<P@;{>ju9wfMj5`M-0%?;%_tvfkUTZvZy19z*~O26Qay$c3OHFHJ$3B^}E;
zEFCNNxw;xLFV4z#%{e@Gs-?2Pmb;^7GspI&ZJpSaBdb)YIY&;lD4?C5lqEu|I9Jkt
z?z(qc@$o}Vi%<|D6RTJg*mN68!Zm!8!zPA66UVfP1d;;VUaPGI8aHwGR%;#T6e(a(
zv5%fJXia7oy`a}}&k*+v6b#V%y<!xDjLmNV!iX>vl8URDZquK<?qOpdHpvc%{Km>?
z1f$;nFrpaa^zrUQ*_&W*k`+T?0z!ZopMohixDF$!a*t!Z!MP_WEvWgz3p5o?cVE}~
zG$j7eFhgd!<d239;|xoZQOKM9!{jFuVf~kx>oJvnt()pn&3fy0s8akt%cpkMOJmNP
MIFAgyyml7&0?F$<Pyhe`

delta 389
zcmZ{fJyL@}7>1vPuqy$@sHj0BnD~o2X)HW~wFj`W@fbOQ1(nB$DV%Y}jI~Gc5RNYd
zO=Yp)@4L^tJL$b7<>&X?9JuDHi(?dGIdU9F_?*<?)N$rGca+od#5Z5nlg+B!4rjNW
zk%>aOF&A7KZmN$UuO2&n4c6(!?6E(453ISf;u=<D;w$ThVx(@YY?OoY6*E=g5i8ne
zn6j!mUI<ttQD<tfAW@aN;$f-H8f~Es(k--gwZUd{KVgeh^zA=lz1z`lSCi0FgCx+`
r@yN8$<5fk~vn%eGM)^NR1L5nR{2H~`L5uZU@Bw*aP;jVR|8odGSMD2w

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar
index e99938ccf2dcdfe9cad572e94c9f7cf63963a589..ef94f3fc1597fde6924e8105f4c48dfe99bbf488 100644
GIT binary patch
delta 57216
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%0AACtH5{)P>7+wMrI<XmB*m1
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

delta 42181
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%0Ac!0$K^a$$Z9nqbvZt>J2A~C=XVsmQ=hV
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

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/controller/CouponController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/controller/CouponController.java
new file mode 100644
index 0000000..dfe0126
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/controller/CouponController.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.xcx.coupon.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "优惠券接口")
+@Slf4j
+@RestController
+@RequestMapping("/coupon")
+public class CouponController {
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/req/CouponPageReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/req/CouponPageReq.java
new file mode 100644
index 0000000..6bdfbb5
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/req/CouponPageReq.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.xcx.coupon.req;
+
+import lombok.Data;
+
+@Data
+public class CouponPageReq {
+
+    private Integer pageNo = 1;
+    private Integer pageSize = 10;
+    private String token;
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/ICouponService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/ICouponService.java
new file mode 100644
index 0000000..e122439
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/ICouponService.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.xcx.coupon.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.xcx.coupon.req.CouponPageReq;
+
+public interface ICouponService {
+
+
+    /**
+     * 优惠券分页接口
+     * @param couponPageReq
+     * @return
+     */
+    Result<?> couponPage(CouponPageReq couponPageReq);
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/impl/CouponServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/impl/CouponServiceImpl.java
new file mode 100644
index 0000000..7b66424
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/coupon/service/impl/CouponServiceImpl.java
@@ -0,0 +1,39 @@
+package org.jeecg.modules.xcx.coupon.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hotelcouponlog.entity.HotelCouponLog;
+import org.jeecg.modules.hotelcouponlog.service.IHotelCouponLogService;
+import org.jeecg.modules.xcx.coupon.req.CouponPageReq;
+import org.jeecg.modules.xcx.coupon.service.ICouponService;
+import org.jeecgframework.codegenerate.a.a;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Service
+public class CouponServiceImpl implements ICouponService {
+
+    @Resource
+    private IHotelCouponLogService hotelCouponLogService;
+    @Resource
+    private ShiroRealm shiroRealm;
+
+    @Override
+    public Result<?> couponPage(CouponPageReq couponPageReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(couponPageReq.getToken());
+        Page<HotelCouponLog> page = new Page<>(couponPageReq.getPageNo(), couponPageReq.getPageSize());
+        Page<HotelCouponLog> hotelCouponLogPage = hotelCouponLogService.lambdaQuery()
+                .eq(HotelCouponLog::getDelFlag, 0)
+                .eq(HotelCouponLog::getStatus, 0)
+                .eq(HotelCouponLog::getUserId, hanHaiMember.getId())
+                .orderByDesc(HotelCouponLog::getCreateTime)
+                .page(page);
+
+        return Result.OK(hotelCouponLogPage);
+    }
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/JoinShoppingCartReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/JoinShoppingCartReq.java
index 5a6024e..27c00c4 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/JoinShoppingCartReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/JoinShoppingCartReq.java
@@ -12,6 +12,8 @@ public class JoinShoppingCartReq {
     @ApiModelProperty(value = "规格id")
     private String skuId;
     private String token;
+    @ApiModelProperty(value = "数量")
+    private Integer num = 1;
 
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java
index 7060403..9fa2c06 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java
@@ -132,11 +132,11 @@ public class GoodsServiceImpl implements IGoodsService {
             hotelShoppingCat.setGoodsId(hotelGoods.getId());
             hotelShoppingCat.setSkuId(hotelGoodsSku.getId());
             hotelShoppingCat.setUserId(hanHaiMember.getId());
-            hotelShoppingCat.setNum(1);
+            hotelShoppingCat.setNum(joinShoppingCartReq.getNum());
             hotelShoppingCatService.save(hotelShoppingCat);
         }else{
             hotelShoppingCat.setId(hotelShoppingCat1.getId());
-            hotelShoppingCat.setNum(hotelShoppingCat1.getNum() + 1);
+            hotelShoppingCat.setNum(hotelShoppingCat1.getNum() + joinShoppingCartReq.getNum());
             hotelShoppingCatService.updateById(hotelShoppingCat1);
         }
 
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 f6c5b28..52736e3 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
@@ -88,4 +88,18 @@ public class OrderController {
         return orderService.confirmAcceptOrder(confirmAcceptOrderReq);
     }
 
+
+    @ApiOperation(value = "换货支付")
+    @PostMapping("/replace/pay")
+    public Result<?> replaceOrderPay(HttpServletRequest request,ReplaceOrderPayReq replaceOrderPayReq){
+        replaceOrderPayReq.setToken(TokenUtils.getTokenByRequest(request));
+        return orderService.replaceOrderPay(replaceOrderPayReq);
+    }
+
+
+    @PostMapping("/replace/notify")
+    public Object replaceOrderNotify(String requestBody){
+        return orderService.replaceOrderNotify(requestBody);
+    }
+
 }
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 63ab541..a288dc2 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
@@ -2,6 +2,7 @@ package org.jeecg.modules.xcx.order.req;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Value;
 
 @Data
 public class ConfirmAcceptOrderReq {
@@ -10,8 +11,21 @@ public class ConfirmAcceptOrderReq {
     /**订单id*/
     @ApiModelProperty(value = "订单id")
     private String id;
-    /**0确认接单 0确认 1不确认*/
-    @ApiModelProperty(value = "0确认接单 0确认 1不确认")
+    /**0确认接单 1确认正常 2破损上报*/
+    @ApiModelProperty(value = "0确认接单 1确认正常 2破损上报")
     private Integer flag = 0;
+    /**商品id*/
+    @ApiModelProperty(value = "商品id")
+    private String goodsId;
+    /**退货数量*/
+    @ApiModelProperty(value = "退货数量")
+    private Integer num;
+    /**详细说明*/
+    @ApiModelProperty(value = "详细说明")
+    private String info;
+    /**图片、视频*/
+    @ApiModelProperty(value = "图片、视频")
+    private String pic;
+
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPageReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPageReq.java
index fcb60ef..d6423f2 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPageReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPageReq.java
@@ -12,7 +12,7 @@ public class OrderPageReq {
     @ApiModelProperty(value = "订单类型 0租赁 1水洗  2破损 3退货")
     private Integer type;
     @ApiModelProperty(value = "用户Id")
-    private String userId;
+    private String uid;
     private String token;
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPayReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPayReq.java
index 25d27f9..e0318a6 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPayReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/OrderPayReq.java
@@ -8,6 +8,8 @@ public class OrderPayReq {
 
     @ApiModelProperty(value = "orderLogId")
     private String id;
+    @ApiModelProperty(value = "优惠券id")
+    private String couponId;
     private String token;
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ReplaceOrderPayReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ReplaceOrderPayReq.java
new file mode 100644
index 0000000..77ee31d
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ReplaceOrderPayReq.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.xcx.order.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ReplaceOrderPayReq {
+
+    private String token;
+    @ApiModelProperty(value = "订单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 93f05e4..a62e452 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
@@ -82,4 +82,19 @@ public interface IOrderService {
      * @return
      */
     Result<?> cancelOrder(CancelOrderReq cancelOrderReq);
+
+
+    /**
+     * 换货订单支付接口
+     * @param replaceOrderPayReq
+     * @return
+     */
+    Result<?> replaceOrderPay(ReplaceOrderPayReq replaceOrderPayReq);
+
+    /**
+     * 换货订单支付回调
+     * @param requestBody
+     * @return
+     */
+    Object replaceOrderNotify(String requestBody);
 }
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 1754bfa..d68f233 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
@@ -27,6 +27,8 @@ import org.jeecg.modules.hotelcategory.entity.HotelCategory;
 import org.jeecg.modules.hotelcategory.service.IHotelCategoryService;
 import org.jeecg.modules.hotelconf.entity.HotelConf;
 import org.jeecg.modules.hotelconf.service.IHotelConfService;
+import org.jeecg.modules.hotelcouponlog.entity.HotelCouponLog;
+import org.jeecg.modules.hotelcouponlog.service.IHotelCouponLogService;
 import org.jeecg.modules.hotelgoods.entity.HotelGoods;
 import org.jeecg.modules.hotelgoods.service.IHotelGoodsService;
 import org.jeecg.modules.hotelgoodssku.entity.HotelGoodsSku;
@@ -83,6 +85,8 @@ public class OrderServiceImpl implements IOrderService {
     private IHotelConfService hotelConfService;
     @Value("${weixin.orderNotifyUrl}")
     private String orderNotifyUrl;
+    @Value("${weixin.replaceOrderNotifyUrl}")
+    private String replaceOrderNotifyUrl;
     @Resource
     private IHotelOrderLogService hotelOrderLogService;
     @Resource
@@ -95,6 +99,8 @@ public class OrderServiceImpl implements IOrderService {
     private IHotelCategoryService hotelCategoryService;
     @Resource
     private IHotelOrderFlowService hotelOrderFlowService;
+    @Resource
+    private IHotelCouponLogService hotelCouponLogService;
 
 
 
@@ -104,19 +110,23 @@ public class OrderServiceImpl implements IOrderService {
         Page<HotelOrder> page = new Page<>(orderPageReq.getPageNo(), orderPageReq.getPageSize());
         LambdaQueryChainWrapper<HotelOrder> queryChainWrapper = hotelOrderService.lambdaQuery();
         queryChainWrapper.eq(HotelOrder::getDelFlag , 0);
-        if(StringUtils.isBlank(orderPageReq.getUserId())){
+        if(StringUtils.isBlank(orderPageReq.getUid())){
             queryChainWrapper.and(ew->ew.eq(HotelOrder::getUserId,hanHaiMember.getId()).or().eq(HotelOrder::getShopId,hanHaiMember.getId()));
 
 
         }else{
+            HotelShop hotelShop = hotelShopService.lambdaQuery()
+                    .eq(HotelShop::getDelFlag, 0)
+                    .eq(HotelShop::getUserId, hanHaiMember.getId())
+                    .one();
             HanHaiMember haiMember = hanHaiMemberService.lambdaQuery()
-                    .eq(HanHaiMember::getId, orderPageReq.getUserId())
-                    .eq(HanHaiMember::getShopId, hanHaiMember.getId())
+                    .eq(HanHaiMember::getId, orderPageReq.getUid())
+                    .eq(HanHaiMember::getShopId, hotelShop.getId())
                     .one();
             if(haiMember == null){
                 throw new JeecgBootException("数据错误，请刷新重试");
             }
-            queryChainWrapper.eq(HotelOrder::getUserId,orderPageReq.getUserId());
+            queryChainWrapper.eq(HotelOrder::getUserId,orderPageReq.getUid());
         }
 
 
@@ -518,6 +528,28 @@ public class OrderServiceImpl implements IOrderService {
                 .eq(HotelOrderLog::getIsPay, 0)
                 .one();
 
+        HotelCouponLog hotelCouponLog = hotelCouponLogService.lambdaQuery()
+                .eq(HotelCouponLog::getDelFlag, 0)
+                .eq(HotelCouponLog::getUserId, hanHaiMember.getId())
+                .eq(HotelCouponLog::getId, orderPayReq.getCouponId())
+                .one();
+
+        HttpServletRequest req = SpringContextUtils.getHttpServletRequest();
+        BigDecimal multiply = BigDecimal.ZERO;
+
+        if(hotelCouponLog != null){
+            if(hotelOrderLog.getOrderPay().compareTo(hotelCouponLog.getConditionPrice()) >= 0){
+                multiply = hotelOrderLog.getOrderPay().subtract(hotelCouponLog.getPrice());
+
+                HotelCouponLog hotelCouponLog1 = new HotelCouponLog();
+                hotelCouponLog1.setId(hotelCouponLog.getId());
+                hotelCouponLog1.setOrderLogId(hotelOrderLog.getId());
+                hotelCouponLogService.updateById(hotelCouponLog1);
+
+            }
+        }
+
+        multiply = multiply.multiply(new BigDecimal(100));
 //        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
 //                .eq(HotelOrder::getDelFlag, 0)
 //                .eq(HotelOrder::getId, orderPayReq.getId())
@@ -528,8 +560,7 @@ public class OrderServiceImpl implements IOrderService {
 //                .eq(HotelGoods::getId, hotelOrder.getGoodsId())
 //                .one();
 
-        HttpServletRequest req = SpringContextUtils.getHttpServletRequest();
-        BigDecimal multiply = hotelOrderLog.getOrderPay().multiply(new BigDecimal(100));
+
         Object order = mpWxPayService.createOrder("酒店桌布", oConvertUtils.getIpAddrByRequest(req), hotelOrderLog.getId(), multiply.intValue(), hotelOrderLog.getId(), hanHaiMember.getAppletOpenid(),orderNotifyUrl,"{}");
 
         return Result.OK(order);
@@ -538,6 +569,11 @@ public class OrderServiceImpl implements IOrderService {
     @Override
     public Object orderNotify(String requestBody) {
         WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+        //对比outTradeNo进行业务处理
+        if (notify == null){
+            //会继续通知
+            return "FAIL";
+        }
         String outTradeNo = notify.getOutTradeNo();
         System.err.println(outTradeNo);
         HotelOrderLog hotelOrderLog = hotelOrderLogService.lambdaQuery()
@@ -555,6 +591,20 @@ public class OrderServiceImpl implements IOrderService {
             System.err.println("订单未找到");
             return "FAIL";
         }
+        HotelCouponLog hotelCouponLog = hotelCouponLogService.lambdaQuery()
+                .eq(HotelCouponLog::getDelFlag, 0)
+                .eq(HotelCouponLog::getStatus, 0)
+                .eq(HotelCouponLog::getOrderLogId, hotelOrderLog.getId())
+                .one();
+
+        if(hotelCouponLog != null){
+            HotelCouponLog hotelCouponLog1 = new HotelCouponLog();
+            hotelCouponLog1.setId(hotelCouponLog.getId());
+            hotelCouponLog1.setStatus(1);
+            hotelCouponLogService.updateById(hotelCouponLog1);
+        }
+
+
         List<HotelOrder> hotelOrders = new ArrayList<>();
         ArrayList<HotelLeaseLog> hotelLeaseLogs = new ArrayList<>();
         Integer type = 0;
@@ -642,11 +692,7 @@ public class OrderServiceImpl implements IOrderService {
 
         hotelOrderService.updateBatchById(hotelOrders);
 
-        //对比outTradeNo进行业务处理
-        if (notify == null){
-            //会继续通知
-            return "FAIL";
-        }
+
         //不再通知该结果
         return "SUCCESS";
     }
@@ -804,6 +850,22 @@ public class OrderServiceImpl implements IOrderService {
                     break;
             }
 
+        }else if(confirmAcceptOrderReq.getFlag() == 2){/*破损换布流程*/
+            HotelShop hotelShop = hotelShopService.lambdaQuery()
+                    .eq(HotelShop::getDelFlag, 0)
+                    .eq(HotelShop::getStatus, 1)
+                    .eq(HotelShop::getUserId, hanHaiMember.getId())
+                    .one();
+
+            if(hotelShop == null){
+                throw new JeecgBootException("数据错误");
+            }
+            hotelOrder1.setStatus(16);
+            hotelOrder1.setReason("破损换布");
+            hotelOrder1.setRefundNum(confirmAcceptOrderReq.getNum());
+            hotelOrder1.setReasonInfo(confirmAcceptOrderReq.getInfo());
+            hotelOrder1.setReasonPic(confirmAcceptOrderReq.getPic());
+            hotelOrder1.setReasonPhone(hotelShop.getPhone());
         }
 
 
@@ -827,6 +889,68 @@ public class OrderServiceImpl implements IOrderService {
         return null;
     }
 
+    @Override
+    public Result<?> replaceOrderPay(ReplaceOrderPayReq replaceOrderPayReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(replaceOrderPayReq.getToken());
+
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getType, 2)
+                .eq(HotelOrder::getStatus, 10)
+                .eq(HotelOrder::getUserId,hanHaiMember.getId())
+                .eq(HotelOrder::getId, replaceOrderPayReq.getId())
+                .one();
+
+        if(hotelOrder == null){
+            throw new JeecgBootException("数据错误，请稍后重试");
+        }
+
+        HttpServletRequest req = SpringContextUtils.getHttpServletRequest();
+        BigDecimal multiply = hotelOrder.getReasonPrice().multiply(new BigDecimal(100));
+        Object order = mpWxPayService.createOrder("酒店桌布换货", oConvertUtils.getIpAddrByRequest(req), hotelOrder.getId(), multiply.intValue(), hotelOrder.getId(), hanHaiMember.getAppletOpenid(),replaceOrderNotifyUrl,"{}");
+
+        return Result.OK(order);
+    }
+
+    @Override
+    public Object replaceOrderNotify(String requestBody) {
+        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+        //对比outTradeNo进行业务处理
+        if (notify == null){
+            //会继续通知
+            return "FAIL";
+        }
+        String outTradeNo = notify.getOutTradeNo();
+        System.err.println(outTradeNo);
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getId, outTradeNo)
+                .one();
+
+        if(hotelOrder.getStatus() == 15){
+            return "SUCCESS";
+        }
+
+        HotelOrder hotelOrder2 = new HotelOrder();
+        hotelOrder2.setId(hotelOrder.getId());
+        hotelOrder2.setStatus(15);
+        hotelOrderService.updateById(hotelOrder2);
+
+        HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery()
+                .eq(HotelLeaseLog::getDelFlag, 0)
+                .eq(HotelLeaseLog::getId, hotelOrder.getId())
+                .one();
+
+        HotelLeaseLog hotelLeaseLog2 = new HotelLeaseLog();
+        hotelLeaseLog2.setId(hotelLeaseLog.getId());
+        hotelLeaseLog2.setStatus(0);
+        hotelLeaseLogService.updateById(hotelLeaseLog2);
+
+
+        //不再通知该结果
+        return "SUCCESS";
+    }
+
     public Object testPay(String id){
         HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
                 .eq(HotelOrder::getDelFlag, 0)
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/controller/ShopController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/controller/ShopController.java
index a1afb21..46a2079 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/controller/ShopController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/controller/ShopController.java
@@ -77,4 +77,11 @@ public class ShopController {
         bindWxReq.setToken(TokenUtils.getTokenByRequest(request));
         return shopService.bindWx(bindWxReq);
     }
+
+    @ApiOperation(value = "修改店铺信息")
+    @PostMapping("/edit/info")
+    public Result<?> editShopInfo(HttpServletRequest request, EditShopInfoReq editShopInfoReq){
+        editShopInfoReq.setToken(TokenUtils.getTokenByRequest(request));
+        return shopService.editShopInfo(editShopInfoReq);
+    }
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/ApplyShopReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/ApplyShopReq.java
index a9856a3..ac7a759 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/ApplyShopReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/ApplyShopReq.java
@@ -21,6 +21,7 @@ public class ApplyShopReq {
     private String address;
     private String password;
     private String token;
+    private String pic;
 
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/EditShopInfoReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/EditShopInfoReq.java
new file mode 100644
index 0000000..4bb8dc4
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/EditShopInfoReq.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.xcx.shop.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EditShopInfoReq {
+
+    private String token;
+    @ApiModelProperty(value = "店铺图像")
+    private String pic;
+    @ApiModelProperty(value = "店铺名")
+    private String name;
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/IShopService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/IShopService.java
index 02963b8..cfe7150 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/IShopService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/IShopService.java
@@ -63,4 +63,11 @@ public interface IShopService {
     Result<?> bindWx(BindWxReq bindWxReq);
 
 
+    /**
+     * 修改店铺信息
+     * @param editShopInfoReq
+     * @return
+     */
+    Result<?> editShopInfo(EditShopInfoReq editShopInfoReq);
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/impl/ShopServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/impl/ShopServiceImpl.java
index 6547c46..7ba5dda 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/impl/ShopServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/service/impl/ShopServiceImpl.java
@@ -100,6 +100,7 @@ public class ShopServiceImpl implements IShopService {
         String encrypt = PasswordUtil.encrypt(applyShopReq.getPassword(), applyShopReq.getPhone(), salt);
         HanHaiMember hanHaiMember1 = new HanHaiMember();
         hanHaiMember1.setId(hanHaiMember.getId());
+        hanHaiMember1.setPhone(applyShopReq.getPhone());
         hanHaiMember1.setPassword(encrypt);
         hanHaiMember1.setPasswordSalt(salt);
         hanHaiMemberService.updateById(hanHaiMember1);
@@ -113,6 +114,8 @@ public class ShopServiceImpl implements IShopService {
         hotelShop1.setLongitude(applyShopReq.getLongitude());
         hotelShop1.setAddress(applyShopReq.getAddress());
         hotelShop1.setStatus(0);
+        hotelShop1.setOldId(hanHaiMember.getId());
+        hotelShop1.setPic(applyShopReq.getPic());
         hotelShopService.save(hotelShop1);
 
         return Result.OK();
@@ -134,7 +137,7 @@ public class ShopServiceImpl implements IShopService {
         if(applyWithdrawalReq.getMoney() == null || applyWithdrawalReq.getMoney().compareTo(BigDecimal.ZERO) <= 0){
             throw new JeecgBootException("请填写正确的提现金额");
         }
-        if(applyWithdrawalReq.getMoney().compareTo(hotelMemberAccount.getShopBalance()) == -1){
+        if(applyWithdrawalReq.getMoney().compareTo(hotelMemberAccount.getShopBalance()) == 1){
             throw new JeecgBootException("提现金额不能大于余额");
         }
         if(StringUtils.isBlank(applyWithdrawalReq.getName())){
@@ -169,7 +172,7 @@ public class ShopServiceImpl implements IShopService {
         hotelBalanceLog.setBankCard(applyWithdrawalReq.getBankCard());
         hotelBalanceLog.setBankAddress(applyWithdrawalReq.getBankAddress());
         hotelBalanceLogService.save(hotelBalanceLog);
-        return null;
+        return Result.OK();
     }
 
     @Override
@@ -213,7 +216,7 @@ public class ShopServiceImpl implements IShopService {
         if(hotelShop == null){
             return Result.OK();
         }
-        ShopIndexResp shopIndex = hanHaiMemberService.getShopIndex(hanHaiMember.getId(), hotelShop.getId());
+        ShopIndexResp shopIndex = hanHaiMemberService.getShopIndex(hotelShop.getUserId(), hotelShop.getId());
         return Result.OK(shopIndex);
     }
 
@@ -283,4 +286,27 @@ public class ShopServiceImpl implements IShopService {
         return Result.OK();
     }
 
+    @Override
+    public Result<?> editShopInfo(EditShopInfoReq editShopInfoReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(editShopInfoReq.getToken());
+
+        HotelShop hotelShop = hotelShopService.lambdaQuery()
+                .eq(HotelShop::getDelFlag, 0)
+                .eq(HotelShop::getUserId, hanHaiMember.getId())
+                .one();
+
+        HotelShop hotelShop1 = new HotelShop();
+        hotelShop1.setId(hotelShop.getId());
+        if(StringUtils.isNotBlank(editShopInfoReq.getPic())){
+            hotelShop1.setPic(editShopInfoReq.getPic());
+        }
+        if(StringUtils.isNotBlank(editShopInfoReq.getName())){
+            hotelShop1.setName(editShopInfoReq.getName());
+        }
+
+        hotelShopService.updateById(hotelShop1);
+
+        return Result.OK();
+    }
+
 }
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 52a0fb5..5005313 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
@@ -45,5 +45,11 @@ public class UserController {
         return userService.myLeasePage(myLeasePageReq);
     }
 
+    @ApiOperation(value = "客服")
+    @GetMapping("/custom")
+    public Result<?> getCustom(){
+        return userService.getCustom();
+    }
+
 
 }
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 f6c91de..b7093c4 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
@@ -28,4 +28,10 @@ public interface IUserService {
      */
     Result<?> myLeasePage(MyLeasePageReq myLeasePageReq);
 
+    /**
+     * 获取客服
+     * @return
+     */
+    Result<?> getCustom();
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/LoginServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/LoginServiceImpl.java
index ae9fe32..d358fda 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/LoginServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/LoginServiceImpl.java
@@ -165,8 +165,12 @@ public class LoginServiceImpl implements ILoginService {
 
             HotelShop hotelShop = hotelShopService.lambdaQuery()
                     .eq(HotelShop::getDelFlag, 0)
+                    .eq(HotelShop::getStatus,1)
                     .eq(HotelShop::getUserId, hanHaiMember.getId())
                     .one();
+            if(hotelShop == null){
+                throw new JeecgBootException("您还不是水洗店，无法使用账号密码登录！");
+            }
             hanHaiMember.setShop(hotelShop);
             String token = JwtUtil.sign(hanHaiMember.getPhone(), hanHaiMember.getPassword());
             redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, 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 d717409..36a3a23 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
@@ -7,6 +7,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.hotelconf.service.IHotelConfService;
 import org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
 import org.jeecg.modules.hotelleaselog.service.IHotelLeaseLogService;
 import org.jeecg.modules.hotelmemberaccount.entity.HotelMemberAccount;
@@ -19,6 +20,8 @@ import org.jeecg.modules.xcx.user.service.IUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class UserServiceImpl implements IUserService {
@@ -33,6 +36,8 @@ public class UserServiceImpl implements IUserService {
     private IHotelLeaseLogService hotelLeaseLogService;
     @Resource
     private IHotelShopService hotelShopService;
+    @Resource
+    private IHotelConfService hotelConfService;
 
     @Override
     public Result<?> getUserInfo(String token) {
@@ -85,4 +90,12 @@ public class UserServiceImpl implements IUserService {
 
         return Result.OK(hotelLeaseLogPage);
     }
+
+    @Override
+    public Result<?> getCustom() {
+        Map<String, Object> map = new HashMap<>();
+        String customerService = hotelConfService.getConf("customerService");
+        map.put("phone",customerService);
+        return Result.OK(map);
+    }
 }
diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml
index b91bd11..46b04f8 100644
--- a/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -134,7 +134,7 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/hotel-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://124.220.65.222:3306/hotel-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
           password: m`A_E+`m
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -147,7 +147,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 124.220.65.222
     lettuce:
       pool:
         max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
@@ -333,4 +333,5 @@ third-app:
 weixin:
   mpAppId: wxad5b3d20a75974c0
   mpAppSecret: 3b60a80c8e673986dd42f3cd6f2cf6b1
-  orderNotifyUrl: https://hotel.java996.icu/hotel/order/notify
\ No newline at end of file
+  orderNotifyUrl: https://hotel.java996.icu/hotel/order/notify
+  replaceOrderNotifyUrl: https://hotel.java996.icu/hotel/order/replace/notify
\ No newline at end of file
diff --git a/jeecg-boot-module-system/src/main/resources/application-pord.yml b/jeecg-boot-module-system/src/main/resources/application-pord.yml
index 3615b65..73a0c5d 100644
--- a/jeecg-boot-module-system/src/main/resources/application-pord.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-pord.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8081
   tomcat:
     max-swallow-size: -1
   error:
@@ -169,6 +169,7 @@ mybatis-plus:
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
+
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
@@ -330,5 +331,6 @@ third-app:
       agent-id: ??
 
 weixin:
-  mpAppId: wx15be4225a7e41a1e
-  mpAppSecret: 0fdb77429ffdf206c151af76a663041c
\ No newline at end of file
+  mpAppId: wxad5b3d20a75974c0
+  mpAppSecret: 3b60a80c8e673986dd42f3cd6f2cf6b1
+  orderNotifyUrl: https://hotel.java996.icu/hotel/order/notify
\ No newline at end of file