diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development
index 7e8bf61..8010fa6 100644
--- a/admin-hanhai-vue/.env.development
+++ b/admin-hanhai-vue/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://hotel.java996.icu/hotel/
+VUE_APP_API_BASE_URL=http://127.0.0.1:8081/hotel/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 
diff --git a/admin-hanhai-vue/src/views/system/CategoryList.vue b/admin-hanhai-vue/src/views/system/CategoryList.vue
index 9c8fcd8..b34eb23 100644
--- a/admin-hanhai-vue/src/views/system/CategoryList.vue
+++ b/admin-hanhai-vue/src/views/system/CategoryList.vue
@@ -50,8 +50,8 @@
             编辑
           </a>
           <a-divider type="vertical"/>
-          <a @click="editDictItem(record)"><a-icon type="setting"/> 分类配置</a>
-          <a-divider type="vertical"/>
+<!--          <a @click="editDictItem(record)"><a-icon type="setting"/> 分类配置</a>-->
+<!--          <a-divider type="vertical"/>-->
           <a-popconfirm title="确定删除吗?" @confirm="() =>handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
@@ -59,7 +59,7 @@
       </a-table>
 
     </div>
-    <dict-modal ref="modalForm" @ok="modalFormOk"></dict-modal>  <!-- 字典类型 -->
+    <category-modal ref="modalForm" @ok="modalFormOk"></category-modal>  <!-- 字典类型 -->
     <dict-item-list ref="dictItemList"></dict-item-list>
     <dict-delete-list ref="dictDeleteList" @refresh="() =>loadData()"></dict-delete-list>
   </a-card>
@@ -110,6 +110,11 @@
             align: "left",
             dataIndex: 'code',
           },
+          {
+            title: '水洗价格',
+            align: "left",
+            dataIndex: 'price',
+          },
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/admin-hanhai-vue/src/views/system/GoodsList.vue b/admin-hanhai-vue/src/views/system/GoodsList.vue
index 8ad0139..e888f06 100644
--- a/admin-hanhai-vue/src/views/system/GoodsList.vue
+++ b/admin-hanhai-vue/src/views/system/GoodsList.vue
@@ -263,6 +263,7 @@
               align: 'center',
               dataIndex: 'name'
             },
+
             {
               title:'商品图',
               align:"center",
@@ -274,6 +275,11 @@
               align:"center",
               dataIndex: 'shopId_dictText'
             },
+            {
+              title: '分类',
+              align: 'center',
+              dataIndex: 'categoryId_dictText'
+            },
             {
               title:'规格',
               align:"center",
diff --git a/admin-hanhai-vue/src/views/system/HotelBalanceLogList.vue b/admin-hanhai-vue/src/views/system/HotelBalanceLogList.vue
new file mode 100644
index 0000000..b6e8316
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/HotelBalanceLogList.vue
@@ -0,0 +1,201 @@
+<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_balance_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-balance-log-modal ref="modalForm" @ok="modalFormOk"></hotel-balance-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelBalanceLogModal from './modules/HotelBalanceLogModal'
+
+  export default {
+    name: 'HotelBalanceLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelBalanceLogModal
+    },
+    data () {
+      return {
+        description: 'hotel_balance_log管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户编号',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'余额',
+            align:"center",
+            dataIndex: 'balance'
+          },
+          {
+            title:'用户余额',
+            align:"center",
+            dataIndex: 'userBalance'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_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: "/hotelbalancelog/hotelBalanceLog/list",
+          delete: "/hotelbalancelog/hotelBalanceLog/delete",
+          deleteBatch: "/hotelbalancelog/hotelBalanceLog/deleteBatch",
+          exportXlsUrl: "/hotelbalancelog/hotelBalanceLog/exportXls",
+          importExcelUrl: "hotelbalancelog/hotelBalanceLog/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:'userId',text:'用户id',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'balance',text:'余额',dictCode:''})
+        // fieldList.push({type:'BigDecimal',value:'userBalance',text:'用户余额',dictCode:''})
+        // fieldList.push({type:'int',value:'type',text:'类型 0交易 1提现',dictCode:''})
+        // fieldList.push({type:'int',value:'status',text:'状态 0未审核 1已审核未打款 2已打款 3审核未通过',dictCode:''})
+        // fieldList.push({type:'int',value:'delFlag',text:'是否删除 0否 1是',dictCode:''})
+        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/HotelConfList.vue b/admin-hanhai-vue/src/views/system/HotelConfList.vue
new file mode 100644
index 0000000..7d30e81
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/HotelConfList.vue
@@ -0,0 +1,188 @@
+<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_conf')">导出</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-conf-modal ref="modalForm" @ok="modalFormOk"></hotel-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelConfModal from './modules/HotelConfModal'
+
+  export default {
+    name: 'HotelConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelConfModal
+    },
+    data () {
+      return {
+        description: 'hotel_conf管理页面',
+        // 表头
+        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: 'value'
+          },
+          {
+            title:'说明',
+            align:"center",
+            dataIndex: 'info'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelconf/hotelConf/list",
+          delete: "/hotelconf/hotelConf/delete",
+          deleteBatch: "/hotelconf/hotelConf/deleteBatch",
+          exportXlsUrl: "/hotelconf/hotelConf/exportXls",
+          importExcelUrl: "hotelconf/hotelConf/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:'name',dictCode:''})
+        fieldList.push({type:'string',value:'value',text:'value',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
+        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/HotelLeaseLogList.vue b/admin-hanhai-vue/src/views/system/HotelLeaseLogList.vue
new file mode 100644
index 0000000..305d07a
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/HotelLeaseLogList.vue
@@ -0,0 +1,239 @@
+<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_lease_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-lease-log-modal ref="modalForm" @ok="modalFormOk"></hotel-lease-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelLeaseLogModal from './modules/HotelLeaseLogModal'
+
+  export default {
+    name: 'HotelLeaseLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelLeaseLogModal
+    },
+    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: 'userId'
+          },
+          {
+            title:'店铺编号',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'订单编号',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title:'商品编号',
+            align:"center",
+            dataIndex: 'goodsId'
+          },
+          {
+            title:'规格编号',
+            align:"center",
+            dataIndex: 'skuId'
+          },
+          {
+            title:'商品名',
+            align:"center",
+            dataIndex: 'goodsName'
+          },
+          {
+            title:'商品图',
+            align:"center",
+            dataIndex: 'goodsPic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'租赁开始时间',
+            align:"center",
+            dataIndex: 'startTime'
+          },
+          {
+            title:'租赁结束时间',
+            align:"center",
+            dataIndex: 'endTime'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelleaselog/hotelLeaseLog/list",
+          delete: "/hotelleaselog/hotelLeaseLog/delete",
+          deleteBatch: "/hotelleaselog/hotelLeaseLog/deleteBatch",
+          exportXlsUrl: "/hotelleaselog/hotelLeaseLog/exportXls",
+          importExcelUrl: "hotelleaselog/hotelLeaseLog/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:'userId',text:'用户id',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'店铺id',dictCode:''})
+        fieldList.push({type:'string',value:'orderId',text:'订单id',dictCode:''})
+        fieldList.push({type:'string',value:'goodsId',text:'商品id',dictCode:''})
+        fieldList.push({type:'string',value:'skuId',text:'规格id',dictCode:''})
+        fieldList.push({type:'datetime',value:'startTime',text:'租赁开始时间'})
+        fieldList.push({type:'datetime',value:'endTime',text:'租赁结束时间'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除 0否 1是',dictCode:''})
+        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/HotelMemberAccountList.vue b/admin-hanhai-vue/src/views/system/HotelMemberAccountList.vue
new file mode 100644
index 0000000..0a67a19
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/HotelMemberAccountList.vue
@@ -0,0 +1,195 @@
+<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_member_account')">导出</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-member-account-modal ref="modalForm" @ok="modalFormOk"></hotel-member-account-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelMemberAccountModal from './modules/HotelMemberAccountModal'
+
+  export default {
+    name: 'HotelMemberAccountList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelMemberAccountModal
+    },
+    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: 'userId'
+          },
+          {
+            title:'余额',
+            align:"center",
+            dataIndex: 'balance'
+          },
+          {
+            title:'押金',
+            align:"center",
+            dataIndex: 'deposit'
+          },
+          {
+            title:'店铺佣金',
+            align:"center",
+            dataIndex: 'shopBalance'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelmemberaccount/hotelMemberAccount/list",
+          delete: "/hotelmemberaccount/hotelMemberAccount/delete",
+          deleteBatch: "/hotelmemberaccount/hotelMemberAccount/deleteBatch",
+          exportXlsUrl: "/hotelmemberaccount/hotelMemberAccount/exportXls",
+          importExcelUrl: "hotelmemberaccount/hotelMemberAccount/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:'userId',text:'用户编号',dictCode:''})
+        // fieldList.push({type:'BigDecimal',value:'balance',text:'余额',dictCode:''})
+        // fieldList.push({type:'BigDecimal',value:'deposit',text:'押金',dictCode:''})
+        // fieldList.push({type:'BigDecimal',value:'shopBalance',text:'店铺佣金',dictCode:''})
+        // fieldList.push({type:'int',value:'delFlag',text:'是否删除 0否 1是',dictCode:''})
+        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/HotelOrderFlowList.vue b/admin-hanhai-vue/src/views/system/HotelOrderFlowList.vue
new file mode 100644
index 0000000..5218098
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/HotelOrderFlowList.vue
@@ -0,0 +1,194 @@
+<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_flow')">导出</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-flow-modal ref="modalForm" @ok="modalFormOk"></hotel-order-flow-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelOrderFlowModal from './modules/HotelOrderFlowModal'
+
+  export default {
+    name: 'HotelOrderFlowList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelOrderFlowModal
+    },
+    data () {
+      return {
+        description: 'hotel_order_flow管理页面',
+        // 表头
+        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: 'value'
+          },
+          {
+            title:'订单类型',
+            align:"center",
+            dataIndex: 'pid'
+          },
+          {
+            title:'排序',
+            align:"center",
+            dataIndex: 'sort'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelorderflow/hotelOrderFlow/list",
+          delete: "/hotelorderflow/hotelOrderFlow/delete",
+          deleteBatch: "/hotelorderflow/hotelOrderFlow/deleteBatch",
+          exportXlsUrl: "/hotelorderflow/hotelOrderFlow/exportXls",
+          importExcelUrl: "hotelorderflow/hotelOrderFlow/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:'name',dictCode:''})
+        fieldList.push({type:'int',value:'value',text:'value',dictCode:''})
+        fieldList.push({type:'int',value:'pid',text:'订单类型',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:''})
+        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 bdcfc67..226c305 100644
--- a/admin-hanhai-vue/src/views/system/HotelShopList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelShopList.vue
@@ -126,6 +126,12 @@
             align:"center",
             dataIndex: 'name'
           },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'pic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
           {
             title:'用户编号',
             align:"center",
@@ -141,6 +147,16 @@
             align:"center",
             dataIndex: 'phone'
           },
+          {
+            title:'绑定用户上限',
+            align:"center",
+            dataIndex: 'userNum'
+          },
+          {
+            title:'分佣比例',
+            align:"center",
+            dataIndex: 'rate'
+          },
           {
             title:'纬度',
             align:"center",
@@ -156,6 +172,21 @@
             align:"center",
             dataIndex: 'address'
           },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'标签',
+            align:"center",
+            dataIndex: 'label_dictText'
+          },
+          {
+            title:'营业时间',
+            align:"center",
+            dataIndex: 'jobTime'
+          },
           {
             title:'是否删除',
             align:"center",
diff --git a/admin-hanhai-vue/src/views/system/modules/CategoryModal.vue b/admin-hanhai-vue/src/views/system/modules/CategoryModal.vue
index 09614ac..7354653 100644
--- a/admin-hanhai-vue/src/views/system/modules/CategoryModal.vue
+++ b/admin-hanhai-vue/src/views/system/modules/CategoryModal.vue
@@ -29,6 +29,15 @@
           <a-input placeholder="请输入分类编码" v-model="model.code"/>
         </a-form-model-item>
 
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="price"
+          required
+          label="水洗价格">
+          <a-input placeholder="请输入分类编码" v-model="model.price"/>
+        </a-form-model-item>
+
 
       </a-form-model>
     </a-spin>
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogForm.vue
new file mode 100644
index 0000000..4097b46
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogForm.vue
@@ -0,0 +1,139 @@
+<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="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="balance">
+              <a-input-number v-model="model.balance" placeholder="请输入余额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户余额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userBalance">
+              <a-input-number v-model="model.userBalance" placeholder="请输入用户余额" 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="balance_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="list" v-model="model.status" dictCode="balance_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: 'HotelBalanceLogForm',
+    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: {
+           balance: [
+              { required: true, message: '请输入余额!'},
+           ],
+           userBalance: [
+              { required: true, message: '请输入用户余额!'},
+           ],
+           delFlag: [
+              { required: true, message: '请输入是否删除 0否 1是!'},
+           ],
+        },
+        url: {
+          add: "/hotelbalancelog/hotelBalanceLog/add",
+          edit: "/hotelbalancelog/hotelBalanceLog/edit",
+          queryById: "/hotelbalancelog/hotelBalanceLog/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/HotelBalanceLogModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogModal.Style#Drawer.vue
new file mode 100644
index 0000000..f0ee5ab
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-balance-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-balance-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 HotelBalanceLogForm from './HotelBalanceLogForm'
+
+  export default {
+    name: 'HotelBalanceLogModal',
+    components: {
+      HotelBalanceLogForm
+    },
+    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/HotelBalanceLogModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogModal.vue
new file mode 100644
index 0000000..7d3c3bd
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelBalanceLogModal.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-balance-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-balance-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelBalanceLogForm from './HotelBalanceLogForm'
+  export default {
+    name: 'HotelBalanceLogModal',
+    components: {
+      HotelBalanceLogForm
+    },
+    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/HotelCategoryForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelCategoryForm.vue
new file mode 100644
index 0000000..6e33368
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelCategoryForm.vue
@@ -0,0 +1,130 @@
+<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="code">
+              <a-input v-model="model.code" placeholder="请输入编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除 0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择是否删除 0否 1是" />
+            </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: 'HotelCategoryForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            sort:1,
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           name: [
+              { required: true, message: '请输入类名!'},
+           ],
+           code: [
+              { required: true, message: '请输入编码!'},
+           ],
+           delFlag: [
+              { required: true, message: '请输入是否删除 0否 1是!'},
+           ],
+        },
+        url: {
+          add: "/hotelcategory/hotelCategory/add",
+          edit: "/hotelcategory/hotelCategory/edit",
+          queryById: "/hotelcategory/hotelCategory/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/HotelCategoryModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelCategoryModal.Style#Drawer.vue
new file mode 100644
index 0000000..0e80bd8
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelCategoryModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-category-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-category-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 HotelCategoryForm from './HotelCategoryForm'
+
+  export default {
+    name: 'HotelCategoryModal',
+    components: {
+      HotelCategoryForm
+    },
+    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/HotelCategoryModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelCategoryModal.vue
new file mode 100644
index 0000000..5092e6e
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelCategoryModal.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-category-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-category-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelCategoryForm from './HotelCategoryForm'
+  export default {
+    name: 'HotelCategoryModal',
+    components: {
+      HotelCategoryForm
+    },
+    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/HotelConfForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelConfForm.vue
new file mode 100644
index 0000000..5d1d28e
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelConfForm.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="名称" :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="value">
+              <a-input v-model="model.value" placeholder="请输入值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-input v-model="model.info" placeholder="请输入说明"  ></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="请选择delFlag" />
+            </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: 'HotelConfForm',
+    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: "/hotelconf/hotelConf/add",
+          edit: "/hotelconf/hotelConf/edit",
+          queryById: "/hotelconf/hotelConf/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/HotelConfModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelConfModal.Style#Drawer.vue
new file mode 100644
index 0000000..ba1c3b7
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelConfModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-conf-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 HotelConfForm from './HotelConfForm'
+
+  export default {
+    name: 'HotelConfModal',
+    components: {
+      HotelConfForm
+    },
+    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/HotelConfModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelConfModal.vue
new file mode 100644
index 0000000..eba6c00
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelConfModal.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-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelConfForm from './HotelConfForm'
+  export default {
+    name: 'HotelConfModal',
+    components: {
+      HotelConfForm
+    },
+    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/HotelGoodsForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelGoodsForm.vue
index 6254482..b7115b4 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelGoodsForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelGoodsForm.vue
@@ -13,6 +13,11 @@
               <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="categoryId">
+                        <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="hotel_category,name,id" placeholder="请选择分类" />
+                      </a-form-model-item>
+                    </a-col>
           <a-col :span="24">
             <a-form-model-item label="原价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalPrice">
               <a-input-number v-model="model.originalPrice" placeholder="请输入原价" style="width: 100%" />
@@ -23,11 +28,11 @@
 <!--              <j-dict-select-tag type="list" v-model="model.shopId" dictCode="hotel_shop,name,id" placeholder="请选择商家id" />-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
-          <a-col :span="24">
-            <a-form-model-item label="规格id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">
-              <j-dict-select-tag type="list" v-model="model.skuId" dictCode="hotel_goods_sku,title,id" placeholder="请选择规格id" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">-->
+<!--              <j-dict-select-tag type="list" v-model="model.skuId" dictCode="hotel_goods_sku,title,id" placeholder="请选择规格id" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="商品详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
               <j-image-upload isMultiple  v-model="model.detail" ></j-image-upload>
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogForm.vue
new file mode 100644
index 0000000..7268ac2
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogForm.vue
@@ -0,0 +1,168 @@
+<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="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="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入店铺编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入订单编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
+              <a-input v-model="model.goodsId" placeholder="请输入商品编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="规格编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">
+              <a-input v-model="model.skuId" placeholder="请输入规格编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsName">
+              <a-input v-model="model.goodsName" placeholder="请输入商品名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsPic">
+              <j-image-upload isMultiple  v-model="model.goodsPic" ></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 v-model="model.price" placeholder="请输入金额"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input v-model="model.num" placeholder="请输入数量"  ></a-input>
+            </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="lease_log_status" placeholder="请选择状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="租赁开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startTime">
+              <j-date placeholder="请选择租赁开始时间"  v-model="model.startTime" :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="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="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: 'HotelLeaseLogForm',
+    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: {
+           delFlag: [
+              { required: true, message: '请输入是否删除 0否 1是!'},
+           ],
+        },
+        url: {
+          add: "/hotelleaselog/hotelLeaseLog/add",
+          edit: "/hotelleaselog/hotelLeaseLog/edit",
+          queryById: "/hotelleaselog/hotelLeaseLog/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/HotelLeaseLogModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogModal.Style#Drawer.vue
new file mode 100644
index 0000000..32038f2
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-lease-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-lease-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 HotelLeaseLogForm from './HotelLeaseLogForm'
+
+  export default {
+    name: 'HotelLeaseLogModal',
+    components: {
+      HotelLeaseLogForm
+    },
+    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/HotelLeaseLogModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogModal.vue
new file mode 100644
index 0000000..a0ac1d4
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelLeaseLogModal.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-lease-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-lease-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelLeaseLogForm from './HotelLeaseLogForm'
+  export default {
+    name: 'HotelLeaseLogModal',
+    components: {
+      HotelLeaseLogForm
+    },
+    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/HotelMemberAccountForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelMemberAccountForm.vue
new file mode 100644
index 0000000..3094087
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelMemberAccountForm.vue
@@ -0,0 +1,128 @@
+<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="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="balance">
+              <a-input-number v-model="model.balance" placeholder="请输入余额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="押金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deposit">
+              <a-input-number v-model="model.deposit" placeholder="请输入押金" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="店铺佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopBalance">
+              <a-input-number v-model="model.shopBalance" placeholder="请输入店铺佣金" style="width: 100%" />
+            </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="请选择是否删除 0否 1是" />
+            </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: 'HotelMemberAccountForm',
+    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: {
+           delFlag: [
+              { required: true, message: '请输入是否删除 0否 1是!'},
+           ],
+        },
+        url: {
+          add: "/hotelmemberaccount/hotelMemberAccount/add",
+          edit: "/hotelmemberaccount/hotelMemberAccount/edit",
+          queryById: "/hotelmemberaccount/hotelMemberAccount/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/HotelMemberAccountModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelMemberAccountModal.Style#Drawer.vue
new file mode 100644
index 0000000..5f8dbff
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelMemberAccountModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <hotel-member-account-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-member-account-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 HotelMemberAccountForm from './HotelMemberAccountForm'
+
+  export default {
+    name: 'HotelMemberAccountModal',
+    components: {
+      HotelMemberAccountForm
+    },
+    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/HotelMemberAccountModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelMemberAccountModal.vue
new file mode 100644
index 0000000..31c0d4c
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelMemberAccountModal.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-member-account-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-member-account-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelMemberAccountForm from './HotelMemberAccountForm'
+  export default {
+    name: 'HotelMemberAccountModal',
+    components: {
+      HotelMemberAccountForm
+    },
+    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/HotelOrderFlowForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelOrderFlowForm.vue
new file mode 100644
index 0000000..832512d
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelOrderFlowForm.vue
@@ -0,0 +1,128 @@
+<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="value">
+              <a-input-number v-model="model.value" placeholder="请输入值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
+              <a-input-number v-model="model.pid" placeholder="请输入订单类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </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: 'HotelOrderFlowForm',
+    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: {
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/hotelorderflow/hotelOrderFlow/add",
+          edit: "/hotelorderflow/hotelOrderFlow/edit",
+          queryById: "/hotelorderflow/hotelOrderFlow/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/HotelOrderFlowModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/system/modules/HotelOrderFlowModal.Style#Drawer.vue
new file mode 100644
index 0000000..47a4bf8
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelOrderFlowModal.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-flow-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-order-flow-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 HotelOrderFlowForm from './HotelOrderFlowForm'
+
+  export default {
+    name: 'HotelOrderFlowModal',
+    components: {
+      HotelOrderFlowForm
+    },
+    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/HotelOrderFlowModal.vue b/admin-hanhai-vue/src/views/system/modules/HotelOrderFlowModal.vue
new file mode 100644
index 0000000..55ac6ac
--- /dev/null
+++ b/admin-hanhai-vue/src/views/system/modules/HotelOrderFlowModal.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-order-flow-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-order-flow-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelOrderFlowForm from './HotelOrderFlowForm'
+  export default {
+    name: 'HotelOrderFlowModal',
+    components: {
+      HotelOrderFlowForm
+    },
+    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/HotelOrderForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue
index 2dd78c1..61665c2 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue
@@ -70,7 +70,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <j-dict-select-tag type="list" v-model="model.status" dictCode="order_status" placeholder="请选择状态 0已下单 1进行中 2已完成 3已退款" />
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="order_status" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue
index 440b77a..3335536 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue
@@ -8,6 +8,11 @@
               <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="userId">
               <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
@@ -23,6 +28,21 @@
               <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">
+              <a-input v-model="model.password" type="password" placeholder="请输入密码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="绑定用户上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userNum">
+              <a-input v-model="model.userNum" placeholder="请输入绑定用户上限"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="分佣比例" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rate">
+              <a-input v-model="model.rate" placeholder="请输入分佣比例"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
               <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
@@ -38,6 +58,21 @@
               <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
             </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="shop_status" placeholder="请选择状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="label">
+              <j-dict-select-tag type="list" v-model="model.label" dictCode="shop_label" placeholder="请选择标签" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobTime">
+              <a-input v-model="model.jobTime" placeholder="请输入营业时间"  ></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="请选择delFlag" />
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 162915f..059202c 100644
Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar differ
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar
index d3183b2..a227d83 100644
Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar differ
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
index c5d6759..027e1e7 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
@@ -176,7 +176,7 @@ public class ShiroRealm extends AuthorizingRealm {
         // 查询用户信息
         log.debug("———校验token是否有效————checkUserTokenIsEffect——————— "+ token);
         HanHaiMember user = commonApi.getUserByNameHanHaiAccount(account);
-        if (user == null || user.getAppletOpenid() == null) {
+        if (user == null) {
             throw new AuthenticationException("用户不存在!");
         }
 //        // 判断用户状态
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java
index b26e301..0be0fcf 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java
@@ -63,4 +63,15 @@ public class LoginReq {
     private Double latitude;
     @ApiModelProperty(value = "经度")
     private Double longitude;
+    /**
+     * 登录方式 0微信 1账号密码
+     */
+    @ApiModelProperty(value = "登录方式 0微信 1账号密码")
+    private Integer loginType = 0;
+    /**账号*/
+    @ApiModelProperty(value = "账号")
+    private String account;
+    /**密码*/
+    @ApiModelProperty(value = "密码")
+    private String password;
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java
index d0a7fa8..010bc52 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java
@@ -49,10 +49,12 @@ public class HotelBalanceLog implements Serializable {
     @ApiModelProperty(value = "用户余额")
     private java.math.BigDecimal userBalance;
 	/**类型 余额记录0   提现记录1   佣金记录2*/
+	@Dict(dicCode = "balance_type")
 	@Excel(name = "类型 余额记录0   提现记录1   佣金记录2", width = 15)
     @ApiModelProperty(value = "类型 0交易 1提现")
     private java.lang.Integer type;
 	/**状态 0未审核 1已审核未打款 2已打款 3审核未通过*/
+	@Dict(dicCode = "balance_status")
 	@Excel(name = "状态 0未审核 1已审核未打款 2已打款 3审核未通过", width = 15)
     @ApiModelProperty(value = "状态 0未审核 1已审核未打款 2已打款 3审核未通过")
     private java.lang.Integer status;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java
index 2eaa321..30cc12a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java
@@ -67,6 +67,8 @@ public class HotelCategory implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "updateTime")
     private java.util.Date updateTime;
+	/**水洗价格*/
+	private BigDecimal price;
 
     @TableField(exist = false)
 	private List<HotelCategoryItem> hotelCategoryItems;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/entity/HotelConf.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/entity/HotelConf.java
index 52fee41..0ec89e3 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/entity/HotelConf.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/entity/HotelConf.java
@@ -6,6 +6,7 @@ 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.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -43,7 +44,11 @@ public class HotelConf implements Serializable {
 	@Excel(name = "value", width = 15)
     @ApiModelProperty(value = "value")
     private java.lang.String value;
+	/**说明*/
+	private String info;
 	/**delFlag*/
+	@TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "delFlag", width = 15)
     @ApiModelProperty(value = "delFlag")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/HotelConfList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/HotelConfList.vue
index 64dba45..7d30e81 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/HotelConfList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/HotelConfList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_conf')">导出</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>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_conf')">导出</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">
@@ -122,17 +122,22 @@
             }
           },
           {
-            title:'name',
+            title:'名称',
             align:"center",
             dataIndex: 'name'
           },
           {
-            title:'value',
+            title:'值',
             align:"center",
             dataIndex: 'value'
           },
           {
-            title:'delFlag',
+            title:'说明',
+            align:"center",
+            dataIndex: 'info'
+          },
+          {
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/modules/HotelConfForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/modules/HotelConfForm.vue
index 1a0f49c..5d1d28e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/modules/HotelConfForm.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelconf/vue/modules/HotelConfForm.vue
@@ -4,18 +4,23 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="name" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入name"  ></a-input>
+            <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="value" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
-              <a-input v-model="model.value" placeholder="请输入value"  ></a-input>
+            <a-form-model-item label="值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
+              <a-input v-model="model.value" placeholder="请输入值"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="delFlag" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择delFlag" />
+            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-input v-model="model.info" placeholder="请输入说明"  ></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="请选择delFlag" />
             </a-form-model-item>
           </a-col>
         </a-row>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelgoods/entity/HotelGoods.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelgoods/entity/HotelGoods.java
index 7cb2318..d2ad0c2 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelgoods/entity/HotelGoods.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelgoods/entity/HotelGoods.java
@@ -86,6 +86,7 @@ public class HotelGoods implements Serializable {
     /**
      * 分类ID
      */
+    @Dict(dictTable = "hotel_category",dicCode = "id",dicText = "name")
 	private String categoryId;
     /**原价*/
     private BigDecimal originalPrice;
@@ -96,4 +97,7 @@ public class HotelGoods implements Serializable {
 	private List<HotelGoodsSku> hotelGoodsSkuList;
 	@TableField(exist = false)
 	private HotelGoodsSku goodsSku;
+	/**押金*/
+	@TableField(exist = false)
+	private BigDecimal depositPrice;
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java
index b01657a..6adf5c7 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java
@@ -4,10 +4,8 @@ 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.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -88,6 +86,7 @@ public class HotelLeaseLog implements Serializable {
 	private String goodsPic;
 	private String sku;
 	/**状态 0正常 1换货 2退货*/
+	@Dict(dicCode = "lease_log_status")
 	private Integer status;
 	/**数量*/
 	private Integer num;
@@ -95,4 +94,13 @@ public class HotelLeaseLog implements Serializable {
 	private BigDecimal price;
 	/**来自用户Id*/
 	private String formUserId;
+	/**是否为租赁水布 0否 1是*/
+	@Dict(dicCode = "is_delete")
+	private Integer leaseFlag;
+	/**分类id*/
+	private String categoryId;
+	@TableField(exist = false)
+	private BigDecimal zujin;
+	@TableField(exist = false)
+	private BigDecimal washPrice;
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java
index 212667f..277d2e7 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/HotelLeaseLogMapper.java
@@ -2,6 +2,8 @@ package org.jeecg.modules.hotelleaselog.mapper;
 
 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.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +16,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface HotelLeaseLogMapper extends BaseMapper<HotelLeaseLog> {
 
+    /**
+     * 我的租赁
+     * @param page
+     * @param userId
+     * @return
+     */
+    IPage<HotelLeaseLog> myLeaseLogPage(Page<HotelLeaseLog> page,@Param("userId") String userId,@Param("leaseFlag") Integer leaseFlag,@Param("status") Integer status);
+
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml
index 0c309f2..221d53a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml
@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.hotelleaselog.mapper.HotelLeaseLogMapper">
 
+
+    <select id="myLeaseLogPage" resultType="org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog">
+        SELECT a.*,
+               (IFNULL(IFNULL(DATEDIFF(NOW(), a.start_time),0)*(SELECT price FROM hotel_goods_sku WHERE id = a.sku_id ),0)) zujin,
+               (a.num*(SELECT price FROM hotel_category WHERE id = a.category_id)) wash_price
+        FROM hotel_lease_log a WHERE a.del_flag = 0 AND a.user_id = #{userId}
+        <if test="leaseFlag != null">
+            AND lease_flag = #{leaseFlag}
+        </if>
+        <if test="status != null">
+            AND status = #{status}
+        </if>
+        ORDER BY a.create_time;
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java
index b54b42f..ea8173c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/IHotelLeaseLogService.java
@@ -1,5 +1,8 @@
 package org.jeecg.modules.hotelleaselog.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +14,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IHotelLeaseLogService extends IService<HotelLeaseLog> {
 
+    /**
+     * 我的租赁
+     * @param page
+     * @param userId
+     * @return
+     */
+    IPage<HotelLeaseLog> myLeaseLogPage(Page<HotelLeaseLog> page, String userId,Integer leaseFlag,Integer status);
+
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java
index 95fb327..ddcc9fa 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/service/impl/HotelLeaseLogServiceImpl.java
@@ -1,5 +1,7 @@
 package org.jeecg.modules.hotelleaselog.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog;
 import org.jeecg.modules.hotelleaselog.mapper.HotelLeaseLogMapper;
 import org.jeecg.modules.hotelleaselog.service.IHotelLeaseLogService;
@@ -16,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class HotelLeaseLogServiceImpl extends ServiceImpl<HotelLeaseLogMapper, HotelLeaseLog> implements IHotelLeaseLogService {
 
+    @Override
+    public IPage<HotelLeaseLog> myLeaseLogPage(Page<HotelLeaseLog> page, String userId,Integer leaseFlag,Integer status) {
+        return baseMapper.myLeaseLogPage(page, userId,leaseFlag,status);
+    }
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/HotelLeaseLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/HotelLeaseLogList.vue
index c5ffa36..305d07a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/HotelLeaseLogList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/HotelLeaseLogList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_lease_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>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_lease_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">
@@ -108,7 +108,7 @@
     },
     data () {
       return {
-        description: 'hotel_lease_log管理页面',
+        description: '我的租赁管理页面',
         // 表头
         columns: [
           {
@@ -122,30 +122,56 @@
             }
           },
           {
-            title:'用户id',
+            title:'用户编号',
             align:"center",
             dataIndex: 'userId'
           },
           {
-            title:'店铺id',
+            title:'店铺编号',
             align:"center",
             dataIndex: 'shopId'
           },
           {
-            title:'订单id',
+            title:'订单编号',
             align:"center",
             dataIndex: 'orderId'
           },
           {
-            title:'商品id',
+            title:'商品编号',
             align:"center",
             dataIndex: 'goodsId'
           },
           {
-            title:'规格id',
+            title:'规格编号',
             align:"center",
             dataIndex: 'skuId'
           },
+          {
+            title:'商品名',
+            align:"center",
+            dataIndex: 'goodsName'
+          },
+          {
+            title:'商品图',
+            align:"center",
+            dataIndex: 'goodsPic',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
           {
             title:'租赁开始时间',
             align:"center",
@@ -157,7 +183,7 @@
             dataIndex: 'endTime'
           },
           {
-            title:'是否删除 0否 1是',
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/modules/HotelLeaseLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/modules/HotelLeaseLogForm.vue
index efbe46d..7268ac2 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/modules/HotelLeaseLogForm.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/vue/modules/HotelLeaseLogForm.vue
@@ -4,28 +4,53 @@
       <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="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户id"  ></a-input>
+            <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="店铺id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
-              <a-input v-model="model.shopId" placeholder="请输入店铺id"  ></a-input>
+            <a-form-model-item label="店铺编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入店铺编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="订单id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
-              <a-input v-model="model.orderId" placeholder="请输入订单id"  ></a-input>
+            <a-form-model-item label="订单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入订单编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="商品id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
-              <a-input v-model="model.goodsId" placeholder="请输入商品id"  ></a-input>
+            <a-form-model-item label="商品编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
+              <a-input v-model="model.goodsId" placeholder="请输入商品编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="规格id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">
-              <a-input v-model="model.skuId" placeholder="请输入规格id"  ></a-input>
+            <a-form-model-item label="规格编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">
+              <a-input v-model="model.skuId" placeholder="请输入规格编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsName">
+              <a-input v-model="model.goodsName" placeholder="请输入商品名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsPic">
+              <j-image-upload isMultiple  v-model="model.goodsPic" ></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 v-model="model.price" placeholder="请输入金额"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input v-model="model.num" placeholder="请输入数量"  ></a-input>
+            </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="lease_log_status" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -39,8 +64,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否删除 0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择是否删除 0否 1是" />
+            <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>
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 b2277b7..64b3413 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
@@ -4,10 +4,12 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hotelorderflow.entity.HotelOrderFlow;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -89,22 +91,22 @@ public class HotelOrder implements Serializable {
 	/**
 	 * 状态
 	 * 租赁订单：0待支付 1待发货 2待收货
-	 * 水洗订单：3待支付 4水洗店接单 5水洗店检查
-	 * 6开始清洗
+	 * 水洗订单：3待支付 4待接单 5待检查
+	 * 6待清洗
 	 * 换货订单：7待回收 8待发货 9平台待收货
-	 * 10平台检查损失待用户支付
+	 * 10平台检查损失待用户支付 17待接单
 	 * 退货订单：11待回收 12待发货 13平台待收货
-	 * 14平台检查损失并且退还定金
+	 * 14平台检查损失并且退还定金 18待接单
 	 * 15 已完成
 	 * */
 	@Excel(name = "状态 \n" +
 			"租赁订单：0待支付 1待发货 2待收货  \n" +
 			"水洗订单：3待支付 4水洗店接单 5水洗店检查\n" +
-			"6开始清洗 \n" +
+			"6开始清洗 16待接单\n" +
 			"换货订单：7待回收 8待发货 9平台待收货\n" +
-			"10平台检查损失待用户支付\n" +
+			"10平台检查损失待用户支付 17待接单\n" +
 			"退货订单：11待回收 12待发货 13平台待收货\n" +
-			"14平台检查损失并且退还定金\n" +
+			"14平台检查损失并且退还定金 18待接单\n" +
 			"15 已完成", width = 15)
     @ApiModelProperty(value = "状态 \n" +
 			"租赁订单：0待支付 1待发货 2待收货  \n" +
@@ -167,5 +169,11 @@ public class HotelOrder implements Serializable {
 	/**是否水洗店租赁订单 0否 1是*/
 	@Dict(dicCode = "is_delete")
 	private Integer washShopFlag;
+	/**分类id*/
+	private String categoryId;
+	/**租赁id*/
+	private String LeaseId;
+	@TableField(exist = false)
+	private List<HotelOrderFlow> hotelOrderFlows;
 
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java
index f114cb7..0ce5ec9 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/HotelOrderMapper.java
@@ -17,4 +17,6 @@ public interface HotelOrderMapper extends BaseMapper<HotelOrder> {
 
     HotelOrder getOrderOne(@Param("id") String id,@Param("userId") String userId);
 
+    HotelOrder getOrderOne2(@Param("id") String id,@Param("userId") String userId);
+
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml
index 0a23561..3b29fc7 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/mapper/xml/HotelOrderMapper.xml
@@ -9,4 +9,11 @@
         FROM hotel_order a WHERE a.del_flag = 0 AND (a.shop_id = #{userId} OR a.user_id = #{userId}) AND a.id = #{id}
     </select>
 
+    <select id="getOrderOne2" resultType="org.jeecg.modules.hotelorder.entity.HotelOrder">
+        SELECT a.*,
+               (SELECT item_text from sys_dict_item where dict_id = (select id from sys_dict where dict_code = 'order_status') and item_value = a.status) status_dictText,
+               (SELECT item_text from sys_dict_item where dict_id = (select id from sys_dict where dict_code = 'hotel_order_type') and item_value = a.type) type_dictText
+        FROM hotel_order a WHERE a.del_flag = 0 AND a.user_id = #{userId} AND a.id = #{id}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java
index ecdf60e..82a2c50 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/IHotelOrderService.java
@@ -14,4 +14,5 @@ public interface IHotelOrderService extends IService<HotelOrder> {
 
     HotelOrder getOrderOne(String id, String userId);
 
+    HotelOrder getOrderOne2(String id, String userId);
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java
index 418a38b..2eef055 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/service/impl/HotelOrderServiceImpl.java
@@ -20,4 +20,9 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderMapper, HotelOr
     public HotelOrder getOrderOne(String id, String userId) {
         return baseMapper.getOrderOne(id, userId);
     }
+
+    @Override
+    public HotelOrder getOrderOne2(String id, String userId) {
+        return baseMapper.getOrderOne2(id, userId);
+    }
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/controller/HotelOrderFlowController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/controller/HotelOrderFlowController.java
new file mode 100644
index 0000000..0546136
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/controller/HotelOrderFlowController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.hotelorderflow.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.hotelorderflow.entity.HotelOrderFlow;
+import org.jeecg.modules.hotelorderflow.service.IHotelOrderFlowService;
+
+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_order_flow
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+@Api(tags="hotel_order_flow")
+@RestController
+@RequestMapping("/hotelorderflow/hotelOrderFlow")
+@Slf4j
+public class HotelOrderFlowController extends JeecgController<HotelOrderFlow, IHotelOrderFlowService> {
+	@Autowired
+	private IHotelOrderFlowService hotelOrderFlowService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param hotelOrderFlow
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_order_flow-分页列表查询")
+	@ApiOperation(value="hotel_order_flow-分页列表查询", notes="hotel_order_flow-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<HotelOrderFlow>> queryPageList(HotelOrderFlow hotelOrderFlow,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<HotelOrderFlow> queryWrapper = QueryGenerator.initQueryWrapper(hotelOrderFlow, req.getParameterMap());
+		Page<HotelOrderFlow> page = new Page<HotelOrderFlow>(pageNo, pageSize);
+		IPage<HotelOrderFlow> pageList = hotelOrderFlowService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param hotelOrderFlow
+	 * @return
+	 */
+	@AutoLog(value = "hotel_order_flow-添加")
+	@ApiOperation(value="hotel_order_flow-添加", notes="hotel_order_flow-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody HotelOrderFlow hotelOrderFlow) {
+		hotelOrderFlowService.save(hotelOrderFlow);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param hotelOrderFlow
+	 * @return
+	 */
+	@AutoLog(value = "hotel_order_flow-编辑")
+	@ApiOperation(value="hotel_order_flow-编辑", notes="hotel_order_flow-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody HotelOrderFlow hotelOrderFlow) {
+		hotelOrderFlowService.updateById(hotelOrderFlow);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "hotel_order_flow-通过id删除")
+	@ApiOperation(value="hotel_order_flow-通过id删除", notes="hotel_order_flow-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		hotelOrderFlowService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "hotel_order_flow-批量删除")
+	@ApiOperation(value="hotel_order_flow-批量删除", notes="hotel_order_flow-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.hotelOrderFlowService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "hotel_order_flow-通过id查询")
+	@ApiOperation(value="hotel_order_flow-通过id查询", notes="hotel_order_flow-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<HotelOrderFlow> queryById(@RequestParam(name="id",required=true) String id) {
+		HotelOrderFlow hotelOrderFlow = hotelOrderFlowService.getById(id);
+		if(hotelOrderFlow==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(hotelOrderFlow);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param hotelOrderFlow
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HotelOrderFlow hotelOrderFlow) {
+        return super.exportXls(request, hotelOrderFlow, HotelOrderFlow.class, "hotel_order_flow");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HotelOrderFlow.class);
+    }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/entity/HotelOrderFlow.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/entity/HotelOrderFlow.java
new file mode 100644
index 0000000..45b1a28
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/entity/HotelOrderFlow.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.hotelorderflow.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_order_flow
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("hotel_order_flow")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="hotel_order_flow对象", description="hotel_order_flow")
+public class HotelOrderFlow implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**名称*/
+	@Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private java.lang.String name;
+	/**值*/
+	@Excel(name = "value", width = 15)
+    @ApiModelProperty(value = "value")
+    private java.lang.Integer value;
+	/**订单类型*/
+	@Excel(name = "订单类型", width = 15)
+    @ApiModelProperty(value = "订单类型")
+    private java.lang.Integer pid;
+	/**是否删除*/
+	@Dict(dicCode = "is_delete")
+	@Excel(name = "是否删除", width = 15)
+    @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;
+	private Integer sort;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/mapper/HotelOrderFlowMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/mapper/HotelOrderFlowMapper.java
new file mode 100644
index 0000000..ce2a2d2
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/mapper/HotelOrderFlowMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.hotelorderflow.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.hotelorderflow.entity.HotelOrderFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: hotel_order_flow
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface HotelOrderFlowMapper extends BaseMapper<HotelOrderFlow> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/mapper/xml/HotelOrderFlowMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/mapper/xml/HotelOrderFlowMapper.xml
new file mode 100644
index 0000000..61569b7
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/mapper/xml/HotelOrderFlowMapper.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.hotelorderflow.mapper.HotelOrderFlowMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/service/IHotelOrderFlowService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/service/IHotelOrderFlowService.java
new file mode 100644
index 0000000..7adbe77
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/service/IHotelOrderFlowService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.hotelorderflow.service;
+
+import org.jeecg.modules.hotelorderflow.entity.HotelOrderFlow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: hotel_order_flow
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface IHotelOrderFlowService extends IService<HotelOrderFlow> {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/service/impl/HotelOrderFlowServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/service/impl/HotelOrderFlowServiceImpl.java
new file mode 100644
index 0000000..31954c6
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/service/impl/HotelOrderFlowServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.hotelorderflow.service.impl;
+
+import org.jeecg.modules.hotelorderflow.entity.HotelOrderFlow;
+import org.jeecg.modules.hotelorderflow.mapper.HotelOrderFlowMapper;
+import org.jeecg.modules.hotelorderflow.service.IHotelOrderFlowService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: hotel_order_flow
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+@Service
+public class HotelOrderFlowServiceImpl extends ServiceImpl<HotelOrderFlowMapper, HotelOrderFlow> implements IHotelOrderFlowService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/HotelOrderFlowList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/HotelOrderFlowList.vue
new file mode 100644
index 0000000..cc7f58b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/HotelOrderFlowList.vue
@@ -0,0 +1,189 @@
+<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_flow')">导出</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-flow-modal ref="modalForm" @ok="modalFormOk"></hotel-order-flow-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HotelOrderFlowModal from './modules/HotelOrderFlowModal'
+
+  export default {
+    name: 'HotelOrderFlowList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HotelOrderFlowModal
+    },
+    data () {
+      return {
+        description: 'hotel_order_flow管理页面',
+        // 表头
+        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: 'value'
+          },
+          {
+            title:'订单类型',
+            align:"center",
+            dataIndex: 'pid'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hotelorderflow/hotelOrderFlow/list",
+          delete: "/hotelorderflow/hotelOrderFlow/delete",
+          deleteBatch: "/hotelorderflow/hotelOrderFlow/deleteBatch",
+          exportXlsUrl: "/hotelorderflow/hotelOrderFlow/exportXls",
+          importExcelUrl: "hotelorderflow/hotelOrderFlow/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:'name',dictCode:''})
+        fieldList.push({type:'int',value:'value',text:'value',dictCode:''})
+        fieldList.push({type:'int',value:'pid',text:'订单类型',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:''})
+        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/hotelorderflow/vue/modules/HotelOrderFlowForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/modules/HotelOrderFlowForm.vue
new file mode 100644
index 0000000..2da9952
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/modules/HotelOrderFlowForm.vue
@@ -0,0 +1,123 @@
+<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="value">
+              <a-input-number v-model="model.value" placeholder="请输入值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
+              <a-input-number v-model="model.pid" placeholder="请输入订单类型" style="width: 100%" />
+            </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: 'HotelOrderFlowForm',
+    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: {
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/hotelorderflow/hotelOrderFlow/add",
+          edit: "/hotelorderflow/hotelOrderFlow/edit",
+          queryById: "/hotelorderflow/hotelOrderFlow/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/hotelorderflow/vue/modules/HotelOrderFlowModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/modules/HotelOrderFlowModal.Style#Drawer.vue
new file mode 100644
index 0000000..47a4bf8
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/modules/HotelOrderFlowModal.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-flow-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></hotel-order-flow-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 HotelOrderFlowForm from './HotelOrderFlowForm'
+
+  export default {
+    name: 'HotelOrderFlowModal',
+    components: {
+      HotelOrderFlowForm
+    },
+    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/hotelorderflow/vue/modules/HotelOrderFlowModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/modules/HotelOrderFlowModal.vue
new file mode 100644
index 0000000..55ac6ac
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue/modules/HotelOrderFlowModal.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-order-flow-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></hotel-order-flow-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HotelOrderFlowForm from './HotelOrderFlowForm'
+  export default {
+    name: 'HotelOrderFlowModal',
+    components: {
+      HotelOrderFlowForm
+    },
+    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/hotelorderflow/vue3/HotelOrderFlow.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlow.api.ts
new file mode 100644
index 0000000..0e9aac0
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlow.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/hotelorderflow/hotelOrderFlow/list',
+  save='/hotelorderflow/hotelOrderFlow/add',
+  edit='/hotelorderflow/hotelOrderFlow/edit',
+  deleteOne = '/hotelorderflow/hotelOrderFlow/delete',
+  deleteBatch = '/hotelorderflow/hotelOrderFlow/deleteBatch',
+  importExcel = '/hotelorderflow/hotelOrderFlow/importExcel',
+  exportXls = '/hotelorderflow/hotelOrderFlow/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/hotelorderflow/vue3/HotelOrderFlow.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlow.data.ts
new file mode 100644
index 0000000..b821569
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlow.data.ts
@@ -0,0 +1,61 @@
+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: 'name',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: 'value',
+    align:"center",
+    dataIndex: 'value'
+   },
+   {
+    title: '订单类型',
+    align:"center",
+    dataIndex: 'pid'
+   },
+   {
+    title: '是否删除',
+    align:"center",
+    dataIndex: 'delFlag_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: 'name',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: 'value',
+    field: 'value',
+    component: 'InputNumber',
+  },
+  {
+    label: '订单类型',
+    field: 'pid',
+    component: 'InputNumber',
+  },
+  {
+    label: '是否删除',
+    field: 'delFlag',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:""
+     },
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入是否删除!'},
+          ];
+     },
+  },
+];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlowList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlowList.vue
new file mode 100644
index 0000000..17d0742
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/HotelOrderFlowList.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>
+    <!-- 表单区域 -->
+    <HotelOrderFlowModal @register="registerModal" @success="handleSuccess"></HotelOrderFlowModal>
+  </div>
+</template>
+
+<script lang="ts" name="hotelorderflow-hotelOrderFlow" 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 HotelOrderFlowModal from './components/HotelOrderFlowModal.vue'
+  import {columns, searchFormSchema} from './hotelOrderFlow.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './hotelOrderFlow.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'hotel_order_flow',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"hotel_order_flow",
+            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/hotelorderflow/vue3/components/HotelOrderFlowModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/components/HotelOrderFlowModal.vue
new file mode 100644
index 0000000..78ed091
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderflow/vue3/components/HotelOrderFlowModal.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 '../hotelOrderFlow.data';
+    import {saveOrUpdate} from '../hotelOrderFlow.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/hotelshop/controller/HotelShopController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/controller/HotelShopController.java
index 3af3312..9124ab0 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
@@ -7,11 +7,20 @@ 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 com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+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.service.IHotelShopService;
 
@@ -49,6 +58,10 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class HotelShopController extends JeecgController<HotelShop, IHotelShopService> {
 	@Autowired
 	private IHotelShopService hotelShopService;
+	@Resource
+	private IHanHaiMemberService hanHaiMemberService;
+	@Resource
+	private IHotelMemberAccountService hotelMemberAccountService;
 	
 	/**
 	 * 分页列表查询
@@ -82,6 +95,21 @@ public class HotelShopController extends JeecgController<HotelShop, IHotelShopSe
 	@ApiOperation(value="hotel_shop-添加", notes="hotel_shop-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody HotelShop hotelShop) {
+		HanHaiMember hanHaiMember = new HanHaiMember();
+		hanHaiMember.setId(IdWorker.getIdStr());
+		hanHaiMember.setPhone(hotelShop.getPhone());
+		String salt = oConvertUtils.randomGen(8);
+		hanHaiMember.setPasswordSalt(salt);
+		String encrypt = PasswordUtil.encrypt(hotelShop.getPassword(), hotelShop.getPhone(), salt);
+		hanHaiMember.setPassword(encrypt);
+		hanHaiMember.setHeadImage(hotelShop.getPic());
+
+		HotelMemberAccount hotelMemberAccount = new HotelMemberAccount();
+		hotelMemberAccount.setUserId(hanHaiMember.getId());
+		hotelShop.setUserId(hanHaiMember.getId());
+
+		hanHaiMemberService.save(hanHaiMember);
+		hotelMemberAccountService.save(hotelMemberAccount);
 		hotelShopService.save(hotelShop);
 		return Result.OK("添加成功！");
 	}
@@ -96,6 +124,18 @@ public class HotelShopController extends JeecgController<HotelShop, IHotelShopSe
 	@ApiOperation(value="hotel_shop-编辑", notes="hotel_shop-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody HotelShop hotelShop) {
+		if(StringUtils.isNotBlank(hotelShop.getPassword())){
+			HanHaiMember hanHaiMember = hanHaiMemberService.lambdaQuery()
+					.eq(HanHaiMember::getId, hotelShop.getUserId())
+					.one();
+			String salt = oConvertUtils.randomGen(8);
+			String encrypt = PasswordUtil.encrypt(hotelShop.getPassword(), hotelShop.getPhone(), salt);
+			HanHaiMember hanHaiMember1 = new HanHaiMember();
+			hanHaiMember1.setId(hanHaiMember.getId());
+			hanHaiMember1.setPassword(encrypt);
+			hanHaiMember1.setPasswordSalt(salt);
+			hanHaiMemberService.updateById(hanHaiMember1);
+		}
 		hotelShopService.updateById(hotelShop);
 		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 aae22c1..40e5327 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
@@ -97,4 +97,6 @@ public class HotelShop implements Serializable {
 	private Integer num;
 	/**分佣比例*/
 	private BigDecimal rate;
+	@TableField(exist = false)
+	private String password;
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroRealm.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroRealm.class
index 6e7a3a5..dae6ea8 100644
Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroRealm.class and b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroRealm.class differ
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/bean/LoginReq.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/bean/LoginReq.class
index 4cbf763..17a4cbe 100644
Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/bean/LoginReq.class and b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/bean/LoginReq.class differ
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 ba831da..e99938c 100644
Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar differ
diff --git a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar
index ee29dba..55f6c46 100644
Binary files a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar differ
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index baeb421..a4cf4ee 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -137,7 +137,11 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		if(oConvertUtils.isEmpty(username)) {
 			return null;
 		}
-		HanHaiMember user = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,username).one();
+		HanHaiMember user = hanHaiMemberService.lambdaQuery()
+				.eq(HanHaiMember::getAppletOpenid,username)
+				.or()
+				.eq(HanHaiMember::getPhone,username)
+				.one();
 		if(user==null) {
 			return null;
 		}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/address/service/impl/AddressServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/address/service/impl/AddressServiceImpl.java
index 730f9e4..288c536 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/address/service/impl/AddressServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/address/service/impl/AddressServiceImpl.java
@@ -134,9 +134,7 @@ public class AddressServiceImpl implements IAddressService {
         if(hotelAddress1 == null || !hotelAddress1.getUserId().equals(hanHaiMember.getId())){
             throw new JeecgBootException("数据错误，请刷新重试");
         }
-        hotelAddress.setId(hotelAddress1.getId());
-        hotelAddress.setDelFlag(1);
-        hotelAddressService.updateById(hotelAddress);
+        hotelAddressService.removeById(hotelAddress1);
         return Result.OK();
     }
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/GoodsListReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/GoodsListReq.java
index 56cb7af..147d02e 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/GoodsListReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/GoodsListReq.java
@@ -15,5 +15,7 @@ public class GoodsListReq {
     /**店铺id*/
     @ApiModelProperty(value = "店铺id")
     private String shopId;
+    @ApiModelProperty(value = "商品名")
+    private String name;
 
 }
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 c7a990f..7060403 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
@@ -9,6 +9,7 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hotelconf.service.IHotelConfService;
 import org.jeecg.modules.hotelgoods.entity.HotelGoods;
 import org.jeecg.modules.hotelgoods.service.IHotelGoodsService;
 import org.jeecg.modules.hotelgoodssku.entity.HotelGoodsSku;
@@ -24,6 +25,7 @@ import org.jeecgframework.codegenerate.a.a;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -42,6 +44,8 @@ public class GoodsServiceImpl implements IGoodsService {
     private HotelShoppingCatMapper hotelShoppingCatMapper;
     @Resource
     private RedisUtil redisUtil;
+    @Resource
+    private IHotelConfService hotelConfService;
 
 
 
@@ -56,6 +60,9 @@ public class GoodsServiceImpl implements IGoodsService {
         if(StringUtils.isNotBlank(goodsListReq.getShopId())){
             query.eq(HotelGoods::getShopId, goodsListReq.getShopId());
         }
+        if(StringUtils.isNotBlank(goodsListReq.getName())){
+            query.like(HotelGoods::getName,goodsListReq.getName());
+        }
 
         Page<HotelGoods> hotelGoodsPage = query.orderByAsc(HotelGoods::getSort).orderByDesc(HotelGoods::getCreateTime).page(page);
 
@@ -83,6 +90,9 @@ public class GoodsServiceImpl implements IGoodsService {
                 .orderByAsc(HotelGoodsSku::getSort)
                 .list();
 
+        BigDecimal depositPrice = new BigDecimal(hotelConfService.getConf("depositPrice"));
+        hotelGoods.setDepositPrice(depositPrice);
+
         hotelGoods.setHotelGoodsSkuList(hotelGoodsSkus);
 
         return Result.OK(hotelGoods);
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 0b67451..f6c5b28 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
@@ -73,4 +73,19 @@ public class OrderController {
         confirmOrderReq.setToken(TokenUtils.getTokenByRequest(request));
         return orderService.confirmOrder(confirmOrderReq);
     }
+
+    @ApiOperation(value = "上传自己的桌布")
+    @PostMapping("/upload/tablecloth")
+    public Result<?> uploadTablecloth(HttpServletRequest request,UploadTableclothReq uploadTableclothReq){
+        uploadTableclothReq.setToken(TokenUtils.getTokenByRequest(request));
+        return orderService.uploadTablecloth(uploadTableclothReq);
+    }
+
+    @ApiOperation(value = "确认接单")
+    @PostMapping("/confirm/accept")
+    public Result<?> confirmAcceptOrder(HttpServletRequest request,ConfirmAcceptOrderReq confirmAcceptOrderReq){
+        confirmAcceptOrderReq.setToken(TokenUtils.getTokenByRequest(request));
+        return orderService.confirmAcceptOrder(confirmAcceptOrderReq);
+    }
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ApplyRefundOrderReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ApplyRefundOrderReq.java
index fabb65d..643281d 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ApplyRefundOrderReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ApplyRefundOrderReq.java
@@ -33,6 +33,8 @@ public class ApplyRefundOrderReq {
     /**联系电话*/
     @ApiModelProperty(value = "联系电话")
     private String phone;
+    @ApiModelProperty(value = "地址id")
+    private String addressId;
     private String token;
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/CancelOrderReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/CancelOrderReq.java
new file mode 100644
index 0000000..0143598
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/CancelOrderReq.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.xcx.order.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CancelOrderReq {
+
+    private String token;
+    @ApiModelProperty(value = "订单id")
+    private String id;
+
+}
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
new file mode 100644
index 0000000..63ab541
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/ConfirmAcceptOrderReq.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.xcx.order.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ConfirmAcceptOrderReq {
+
+    private String token;
+    /**订单id*/
+    @ApiModelProperty(value = "订单id")
+    private String id;
+    /**0确认接单 0确认 1不确认*/
+    @ApiModelProperty(value = "0确认接单 0确认 1不确认")
+    private Integer flag = 0;
+
+}
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 20abe0a..25d27f9 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
@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class OrderPayReq {
 
-    @ApiModelProperty(value = "订单Id")
+    @ApiModelProperty(value = "orderLogId")
     private String id;
     private String token;
 
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/UploadTableclothReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/UploadTableclothReq.java
new file mode 100644
index 0000000..c515eb6
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/UploadTableclothReq.java
@@ -0,0 +1,29 @@
+package org.jeecg.modules.xcx.order.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UploadTableclothReq {
+
+    private String token;
+    /**商品图片*/
+    @ApiModelProperty(value = "商品图片")
+    private String pic;
+    /**商品名*/
+    @ApiModelProperty(value = "商品名")
+    private String name;
+    /**数量*/
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+    /**长度*/
+    @ApiModelProperty(value = "长度")
+    private String length;
+    /**宽*/
+    @ApiModelProperty(value = "宽")
+    private String wide;
+    /**分类id*/
+    @ApiModelProperty(value = "分类id")
+    private String categoryId;
+
+}
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 65c5c47..93f05e4 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
@@ -27,7 +27,7 @@ public interface IOrderService {
 
     /**
      * 创建订单
-     * @param createOrderReq
+     * @param req
      * @return
      */
     Result<?> createOrder(String req, String token);
@@ -62,4 +62,24 @@ public interface IOrderService {
      */
     Result<?> confirmOrder(ConfirmOrderReq confirmOrderReq);
 
+    /**
+     * 上传桌布
+     * @param uploadTableclothReq
+     * @return
+     */
+    Result<?> uploadTablecloth(UploadTableclothReq uploadTableclothReq);
+
+    /**
+     * 确认接单
+     * @param confirmAcceptOrderReq
+     * @return
+     */
+    Result<?> confirmAcceptOrder(ConfirmAcceptOrderReq confirmAcceptOrderReq);
+
+    /**
+     * 取消订单
+     * @param cancelOrderReq
+     * @return
+     */
+    Result<?> cancelOrder(CancelOrderReq cancelOrderReq);
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
index ec5984a..1754bfa 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
@@ -23,6 +23,8 @@ import org.jeecg.modules.hoteladdress.entity.HotelAddress;
 import org.jeecg.modules.hoteladdress.service.IHotelAddressService;
 import org.jeecg.modules.hotelbalancelog.entity.HotelBalanceLog;
 import org.jeecg.modules.hotelbalancelog.service.IHotelBalanceLogService;
+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.hotelgoods.entity.HotelGoods;
@@ -35,6 +37,8 @@ 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.service.IHotelOrderService;
+import org.jeecg.modules.hotelorderflow.entity.HotelOrderFlow;
+import org.jeecg.modules.hotelorderflow.service.IHotelOrderFlowService;
 import org.jeecg.modules.hotelorderlog.entity.HotelOrderLog;
 import org.jeecg.modules.hotelorderlog.service.IHotelOrderLogService;
 import org.jeecg.modules.hotelshop.entity.HotelShop;
@@ -87,6 +91,10 @@ public class OrderServiceImpl implements IOrderService {
     private IHotelMemberAccountService hotelMemberAccountService;
     @Resource
     private IHotelBalanceLogService hotelBalanceLogService;
+    @Resource
+    private IHotelCategoryService hotelCategoryService;
+    @Resource
+    private IHotelOrderFlowService hotelOrderFlowService;
 
 
 
@@ -97,7 +105,9 @@ public class OrderServiceImpl implements IOrderService {
         LambdaQueryChainWrapper<HotelOrder> queryChainWrapper = hotelOrderService.lambdaQuery();
         queryChainWrapper.eq(HotelOrder::getDelFlag , 0);
         if(StringUtils.isBlank(orderPageReq.getUserId())){
-             queryChainWrapper.eq(HotelOrder::getUserId,hanHaiMember.getId());
+            queryChainWrapper.and(ew->ew.eq(HotelOrder::getUserId,hanHaiMember.getId()).or().eq(HotelOrder::getShopId,hanHaiMember.getId()));
+
+
         }else{
             HanHaiMember haiMember = hanHaiMemberService.lambdaQuery()
                     .eq(HanHaiMember::getId, orderPageReq.getUserId())
@@ -123,7 +133,24 @@ public class OrderServiceImpl implements IOrderService {
     @Override
     public Result<?> orderDetail(String id, String token) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
-        HotelOrder hotelOrder = hotelOrderService.getOrderOne(id,hanHaiMember.getId());
+        HotelShop hotelShop = hotelShopService.lambdaQuery()
+                .eq(HotelShop::getDelFlag, 0)
+                .eq(HotelShop::getUserId, hanHaiMember.getId())
+                .one();
+//        HotelOrder byId = hotelOrderService.getById(id);
+        HotelOrder hotelOrder = null;
+//        if(hotelShop == null){
+            hotelOrder = hotelOrderService.getOrderOne(id,hanHaiMember.getId());
+//        }else if(byId.getType() == 0 ){
+//            hotelOrder = hotelOrderService.getOrderOne2(id,hotelShop.getUserId());
+//        }
+        List<HotelOrderFlow> hotelOrderFlows = hotelOrderFlowService.lambdaQuery()
+                .eq(HotelOrderFlow::getDelFlag, 0)
+                .eq(HotelOrderFlow::getPid, hotelOrder.getType())
+                .orderByAsc(HotelOrderFlow::getSort)
+                .list();
+        hotelOrder.setHotelOrderFlows(hotelOrderFlows);
+
 //        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
 //                .eq(HotelOrder::getDelFlag, 0)
 //                .and(qw -> qw.eq(HotelOrder::getShopId, hanHaiMember.getId()).or().eq(HotelOrder::getUserId, hanHaiMember.getId()))
@@ -159,16 +186,8 @@ public class OrderServiceImpl implements IOrderService {
         HotelOrderLog hotelOrderLog = new HotelOrderLog();
         hotelOrderLog.setId(IdWorker.getIdStr());
         for (CreateOrderReq createOrderReq:createOrderReqs){
-            if(StringUtils.isBlank(createOrderReq.getId())){
-                throw new JeecgBootException("商品信息错误");
-            }
-            HotelGoods hotelGoods = hotelGoodsService.lambdaQuery()
-                    .eq(HotelGoods::getDelFlag, 0)
-                    .eq(HotelGoods::getId, createOrderReq.getId())
-                    .one();
-            if(hotelGoods == null){
-                throw new JeecgBootException("商品信息错误");
-            }
+
+
             Long count = hotelAddressService.lambdaQuery()
                     .eq(HotelAddress::getDelFlag, 0)
                     .eq(HotelAddress::getUserId, hanHaiMember.getId())
@@ -190,23 +209,41 @@ public class OrderServiceImpl implements IOrderService {
                     .one();
             BigDecimal depositPrice = new BigDecimal(hotelConf.getValue());
 
-            HotelGoodsSku hotelGoodsSku = hotelGoodsSkuService.lambdaQuery()
-                    .eq(HotelGoodsSku::getDelFlag, 0)
-                    .eq(HotelGoodsSku::getId, createOrderReq.getSkuId())
-                    .one();
-            if(hotelGoodsSku == null){
-                throw new JeecgBootException("规格信息错误");
-            }
+
 
             HotelOrder hotelOrder = new HotelOrder();
-            HotelOrder hotelOrder2 = new HotelOrder();
+            HotelOrder hotelOrder2 = null;
 
             //租赁逻辑
             if(createOrderReq.getType() == 0){
+                hotelOrder2 = new HotelOrder();
+                if(StringUtils.isBlank(createOrderReq.getId())){
+                    throw new JeecgBootException("商品信息错误");
+                }
+                HotelGoods hotelGoods = hotelGoodsService.lambdaQuery()
+                        .eq(HotelGoods::getDelFlag, 0)
+                        .eq(HotelGoods::getId, createOrderReq.getId())
+                        .one();
+                if(hotelGoods == null){
+                    throw new JeecgBootException("商品信息错误");
+                }
+
                 if(StringUtils.isBlank(createOrderReq.getSkuId())){
                     throw new JeecgBootException("请选择规格");
                 }
 
+                HotelGoodsSku hotelGoodsSku = hotelGoodsSkuService.lambdaQuery()
+                        .eq(HotelGoodsSku::getDelFlag, 0)
+                        .eq(HotelGoodsSku::getId, createOrderReq.getSkuId())
+                        .one();
+                if(hotelGoodsSku == null){
+                    throw new JeecgBootException("规格信息错误");
+                }
+
+                HotelCategory hotelCategory = hotelCategoryService.lambdaQuery()
+                        .eq(HotelCategory::getDelFlag, 0)
+                        .eq(HotelCategory::getId, hotelGoods.getCategoryId())
+                        .one();
 
                 BigDecimal price = depositPrice.multiply(new BigDecimal(createOrderReq.getNum()));
                 totalPrice = totalPrice.add(price);
@@ -217,7 +254,7 @@ public class OrderServiceImpl implements IOrderService {
                 hotelOrder.setUserPhone(hotelAddress.getPhone());
                 hotelOrder.setUserAddress(hotelAddress.getAddress()+hotelAddress.getAddressDetail());
                 hotelOrder.setUserId(hanHaiMember.getId());
-                hotelOrder.setShopId(hotelShop.getUserId());
+//                hotelOrder.setShopId(hotelShop.getUserId());
                 hotelOrder.setDeposit(price);
                 hotelOrder.setType(0);
                 hotelOrder.setStatus(0);
@@ -229,6 +266,7 @@ public class OrderServiceImpl implements IOrderService {
                 hotelOrder.setOrderPay(price);
                 hotelOrder.setOrderLogId(hotelOrderLog.getId());
                 hotelOrder.setWashShopFlag(0);
+                hotelOrder.setCategoryId(hotelCategory.getId());
 
                 /*水洗店*/
                 hotelOrder2.setTitle(hotelGoods.getName());
@@ -249,6 +287,7 @@ public class OrderServiceImpl implements IOrderService {
                 hotelOrder2.setOrderPay(price);
                 hotelOrder2.setOrderLogId(hotelOrderLog.getId());
                 hotelOrder2.setWashShopFlag(1);
+                hotelOrder2.setCategoryId(hotelCategory.getId());
 
 
             }else if(createOrderReq.getType() == 1){/*水洗逻辑*/
@@ -260,21 +299,48 @@ public class OrderServiceImpl implements IOrderService {
                 if(hotelLeaseLog == null){
                     throw new JeecgBootException("数据错误，请刷新重试");
                 }
-                if(hotelLeaseLog.getStartTime() == null){
+                if(hotelLeaseLog.getLeaseFlag() == 1 && hotelLeaseLog.getStartTime() == null){
                     throw new JeecgBootException("还未确认收货，无法水洗");
                 }
-                if(!StringUtils.equals(createOrderReq.getShopId(), hotelLeaseLog.getShopId())){
-                    throw new JeecgBootException("所选择的店铺不是绑定店铺");
+
+                HotelOrder hotelOrder1 = hotelOrderService.lambdaQuery()
+                        .eq(HotelOrder::getDelFlag, 0)
+                        .eq(HotelOrder::getType, 1)
+                        .in(HotelOrder::getStatus, 4, 5, 6, 16)
+                        .eq(HotelOrder::getLeaseId, hotelLeaseLog.getId())
+                        .one();
+                if(hotelOrder1 != null){
+                    throw new JeecgBootException("该租赁正在水洗中");
                 }
+//                if(!StringUtils.equals(createOrderReq.getShopId(), hotelLeaseLog.getShopId())){
+//                    throw new JeecgBootException("所选择的店铺不是绑定店铺");
+//                }
+
+//                if(StringUtils.isBlank(createOrderReq.getId())){
+//                    throw new JeecgBootException("商品信息错误");
+//                }
+
+
+                HotelCategory hotelCategory = hotelCategoryService.lambdaQuery()
+                        .eq(HotelCategory::getDelFlag, 0)
+                        .eq(HotelCategory::getId, hotelLeaseLog.getCategoryId())
+                        .one();
 
                 /*相差天数*/
-                Long untilDay = DateUtils2.getUntilDay(hotelLeaseLog.getStartTime(), new Date(DateUtils2.getNowDateStrings()));
-                /*租赁费用*/
-                BigDecimal sumDepositPrice = depositPrice.multiply(new BigDecimal(untilDay));
+                Long untilDay = new Long(0);
+                BigDecimal sumDepositPrice = BigDecimal.ZERO;
+                if(hotelLeaseLog.getLeaseFlag() == 1){
+                    untilDay = DateUtils2.getUntilDay(hotelLeaseLog.getStartTime(), DateUtils2.getDate(DateUtils2.getNowDate()));
+//                untilDay = untilDay == null
+                    /*租赁费用*/
+                    sumDepositPrice = depositPrice.multiply(new BigDecimal(untilDay));
+                }
+
                 /*水洗费用*/
-                BigDecimal washPrice = hotelGoodsSku.getPrice().multiply(new BigDecimal(createOrderReq.getNum()));
+                BigDecimal washPrice = hotelCategory.getPrice().multiply(new BigDecimal(hotelLeaseLog.getNum()));
                 /*总费用*/
                 BigDecimal countPrice = sumDepositPrice.add(washPrice);
+                totalPrice = totalPrice.add(countPrice);
 
                 hotelOrder.setTitle(hotelLeaseLog.getGoodsName());
                 hotelOrder.setPic(hotelLeaseLog.getGoodsPic());
@@ -288,17 +354,25 @@ public class OrderServiceImpl implements IOrderService {
                 hotelOrder.setOrderPay(countPrice);
                 hotelOrder.setType(1);
                 hotelOrder.setStatus(3);
-                hotelOrder.setGoodsId(hotelGoods.getId());
-                hotelOrder.setGoodsName(hotelGoods.getName());
-                hotelOrder.setSkuId(hotelGoodsSku.getId());
-                hotelOrder.setSku(hotelGoodsSku.getTitle());
+                if(StringUtils.isNotBlank(hotelLeaseLog.getGoodsId())){
+                    hotelOrder.setGoodsId(hotelLeaseLog.getGoodsId());
+                }
+
+                hotelOrder.setGoodsName(hotelLeaseLog.getGoodsName());
+                if(StringUtils.isNotBlank(hotelLeaseLog.getSkuId())){
+                    hotelOrder.setSkuId(hotelLeaseLog.getSkuId());
+                }
+
+                hotelOrder.setSku(hotelLeaseLog.getSku());
                 hotelOrder.setNum(createOrderReq.getNum());
-                hotelOrder.setOrderLogId(hotelLeaseLog.getId());
+                hotelOrder.setOrderLogId(hotelOrderLog.getId());
+                hotelOrder.setLeaseId(hotelLeaseLog.getId());
 
             }
             hotelOrders.add(hotelOrder);
-            hotelOrders2.add(hotelOrder2);
-
+            if(hotelOrder2 != null){
+                hotelOrders2.add(hotelOrder2);
+            }
         }
         hotelOrderLog.setOrderPay(totalPrice);
         hotelOrderLog.setUserId(hanHaiMember.getId());
@@ -330,6 +404,19 @@ public class OrderServiceImpl implements IOrderService {
             String name = applyRefundOrderReq.getType() == 0?"退货数量":"换货数量";
             throw new JeecgBootException("请填写"+name);
         }
+
+        if(StringUtils.isBlank(applyRefundOrderReq.getAddressId())){
+            throw new JeecgBootException("请选择收货地址");
+        }
+        HotelAddress hotelAddress = hotelAddressService.lambdaQuery()
+                .eq(HotelAddress::getDelFlag, 0)
+                .eq(HotelAddress::getId, applyRefundOrderReq.getAddressId())
+                .one();
+        if(hotelAddress == null){
+            throw new JeecgBootException("地址数据错误");
+        }
+
+
         HotelOrder hotelOrder1 = new HotelOrder();
 
         if(applyRefundOrderReq.getType() == 0){
@@ -347,6 +434,43 @@ public class OrderServiceImpl implements IOrderService {
         if(hotelLeaseLog == null){
             throw new JeecgBootException("数据错误，请刷新重试");
         }
+        List<HotelOrder> hotelOrders = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getLeaseId, hotelLeaseLog.getId())
+                .ne(HotelOrder::getStatus, 15)
+                .list();
+        if(hotelOrders.size() != 0){
+            throw new JeecgBootException("该租赁不可操作");
+        }
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getId, hotelLeaseLog.getOrderId())
+                .one();
+        if(hotelOrder.getStatus() != 15){
+            throw new JeecgBootException("该订单还未收货");
+        }
+
+        HotelShop hotelShop = hotelShopService.lambdaQuery()
+                .eq(HotelShop::getDelFlag, 0)
+                .eq(HotelShop::getId, hanHaiMember.getShopId())
+                .one();
+        HotelLeaseLog hotelLeaseLog2 = new HotelLeaseLog();
+        if(hotelLeaseLog.getNum() > applyRefundOrderReq.getRefundNum()){
+
+            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(applyRefundOrderReq.getType() == 0?2:1);
+            hotelLeaseLog2.setNum(applyRefundOrderReq.getRefundNum());
+            hotelLeaseLog2.setPrice(hotelLeaseLog.getPrice());
+            hotelLeaseLog2.setCategoryId(hotelLeaseLog.getCategoryId());
+            hotelLeaseLogService.save(hotelLeaseLog2);
+        }
 
 
         hotelOrder1.setReason(applyRefundOrderReq.getReason());
@@ -363,13 +487,24 @@ public class OrderServiceImpl implements IOrderService {
         hotelOrder1.setSku(hotelLeaseLog.getSku());
         hotelOrder1.setPic(hotelLeaseLog.getGoodsPic());
         hotelOrder1.setStatus(applyRefundOrderReq.getType() == 0 ?11:7);
+        hotelOrder1.setLeaseId(hotelLeaseLog.getNum() > applyRefundOrderReq.getRefundNum()?hotelLeaseLog2.getId():hotelLeaseLog.getId());
+        hotelOrder1.setUserName(hotelAddress.getName());
+        hotelOrder1.setUserPhone(hotelAddress.getPhone());
+        hotelOrder1.setUserAddress(hotelAddress.getAddress()+hotelAddress.getAddressDetail());
+        hotelOrder1.setShopId(hotelShop.getUserId());
         hotelOrderService.save(hotelOrder1);
 
         HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
         hotelLeaseLog1.setId(hotelLeaseLog.getId());
-        hotelLeaseLog1.setStatus(applyRefundOrderReq.getType() == 0?2:1);
+        if(hotelLeaseLog.getNum() == applyRefundOrderReq.getRefundNum()){
+          hotelLeaseLog1.setStatus(applyRefundOrderReq.getType() == 0?2:1);
+        }
+
+        hotelLeaseLog1.setNum(hotelLeaseLog.getNum() - applyRefundOrderReq.getRefundNum());
         hotelLeaseLogService.updateById(hotelLeaseLog1);
 
+
+
         return Result.OK();
     }
 
@@ -422,6 +557,7 @@ public class OrderServiceImpl implements IOrderService {
         }
         List<HotelOrder> hotelOrders = new ArrayList<>();
         ArrayList<HotelLeaseLog> hotelLeaseLogs = new ArrayList<>();
+        Integer type = 0;
         for (HotelOrder hotelOrder:hotelOrderList) {
             /*租赁业务*/
             if(hotelOrder.getType() == 0){
@@ -443,6 +579,7 @@ public class OrderServiceImpl implements IOrderService {
                     hotelLeaseLog.setNum(hotelOrder.getNum());
                     hotelLeaseLog.setPrice(hotelOrder.getDeposit());
                     hotelLeaseLog.setFormUserId(hotelOrderLog.getUserId());
+                    hotelLeaseLog.setCategoryId(hotelOrder.getCategoryId());
                 }else{
                     hotelLeaseLog.setUserId(hotelOrder.getUserId());
                     hotelLeaseLog.setShopId(hotelOrder.getShopId());
@@ -455,6 +592,7 @@ public class OrderServiceImpl implements IOrderService {
                     hotelLeaseLog.setStatus(0);
                     hotelLeaseLog.setNum(hotelOrder.getNum());
                     hotelLeaseLog.setPrice(hotelOrder.getDeposit());
+                    hotelLeaseLog.setCategoryId(hotelOrder.getCategoryId());
                 }
 
 
@@ -466,10 +604,28 @@ public class OrderServiceImpl implements IOrderService {
                 hotelOrders.add(hotelOrder1);
 
         }else if(hotelOrder.getType() == 1){/*水洗逻辑*/
+
                 HotelOrder hotelOrder1 = new HotelOrder();
                 hotelOrder1.setId(hotelOrder.getId());
                 hotelOrder1.setStatus(4);
                 hotelOrders.add(hotelOrder1);
+
+                HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery()
+                        .eq(HotelLeaseLog::getDelFlag, 0)
+                        .eq(HotelLeaseLog::getId, hotelOrder.getLeaseId())
+                        .one();
+                if(hotelLeaseLog == null){
+                    return "FAIL";
+                }
+                if(hotelLeaseLog.getLeaseFlag() == 1){
+                    type = 1;
+                    HotelLeaseLog hotelLeaseLog1 = new HotelLeaseLog();
+                    hotelLeaseLog1.setId(hotelLeaseLog.getId());
+                    hotelLeaseLog1.setStartTime(new Date());
+                    hotelLeaseLogs.add(hotelLeaseLog1);
+                }
+
+
             }
 
         }
@@ -478,7 +634,12 @@ public class OrderServiceImpl implements IOrderService {
         hotelOrderLog1.setIsPay(1);
         hotelOrderLogService.updateById(hotelOrderLog1);
 
-        hotelLeaseLogService.saveBatch(hotelLeaseLogs);
+        if(type == 0){
+            hotelLeaseLogService.saveBatch(hotelLeaseLogs);
+        }else{
+            hotelLeaseLogService.updateBatchById(hotelLeaseLogs);
+        }
+
         hotelOrderService.updateBatchById(hotelOrders);
 
         //对比outTradeNo进行业务处理
@@ -503,12 +664,15 @@ public class OrderServiceImpl implements IOrderService {
         HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
                 .eq(HotelOrder::getDelFlag, 0)
                 .eq(HotelOrder::getId, confirmOrderReq.getId())
-                .eq(HotelOrder::getUserId, hanHaiMember.getId())
+//                .eq(HotelOrder::getUserId, hanHaiMember.getId())
                 .one();
         if(hotelOrder == null){
             throw new JeecgBootException("数据错误，请刷新重试");
         }
         if(hotelOrder.getType() == 0){
+            if(!StringUtils.equals(hotelOrder.getUserId(),hanHaiMember.getId())){
+                throw new JeecgBootException("数据订单错误");
+            }
             HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery()
                     .eq(HotelLeaseLog::getDelFlag, 0)
                     .eq(HotelLeaseLog::getOrderId, hotelOrder.getId())
@@ -526,7 +690,9 @@ public class OrderServiceImpl implements IOrderService {
             hotelLeaseLog1.setStartTime(new Date());
             hotelLeaseLogService.updateById(hotelLeaseLog1);
         }else if(hotelOrder.getType() == 1){
-
+            if(!StringUtils.equals(hotelOrder.getShopId(),hanHaiMember.getId())){
+                throw new JeecgBootException("数据订单错误");
+            }
             HotelShop hotelShop = hotelShopService.lambdaQuery()
                     .eq(HotelShop::getDelFlag, 0)
                     .eq(HotelShop::getUserId, hotelOrder.getShopId())
@@ -561,13 +727,106 @@ public class OrderServiceImpl implements IOrderService {
             hotelBalanceLog.setOrderId(hotelOrder.getId());
             hotelBalanceLogService.save(hotelBalanceLog);
 
+            HotelOrder hotelOrder1 = new HotelOrder();
+            hotelOrder1.setId(hotelOrder.getId());
+            hotelOrder1.setStatus(15);
+            hotelOrderService.updateById(hotelOrder1);
+
+        }
+
+
+        return Result.OK();
+    }
+
+    @Override
+    public Result<?> uploadTablecloth(UploadTableclothReq uploadTableclothReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(uploadTableclothReq.getToken());
+        if(StringUtils.isBlank(uploadTableclothReq.getCategoryId())){
+            throw new JeecgBootException("请选择分类");
+        }
+        if(uploadTableclothReq.getNum() == null || uploadTableclothReq.getNum() <= 0){
+            throw new JeecgBootException("请填写数量");
+        }
+        if(StringUtils.isBlank(uploadTableclothReq.getLength())){
+            throw new JeecgBootException("请填写长度");
+        }
+        if(StringUtils.isBlank(uploadTableclothReq.getWide())){
+            throw new JeecgBootException("请填写宽");
+        }
+
+        HotelLeaseLog hotelLeaseLog = new HotelLeaseLog();
+        hotelLeaseLog.setCategoryId(uploadTableclothReq.getCategoryId());
+        hotelLeaseLog.setGoodsName(uploadTableclothReq.getName());
+        hotelLeaseLog.setNum(uploadTableclothReq.getNum());
+        hotelLeaseLog.setGoodsPic(uploadTableclothReq.getPic());
+        hotelLeaseLog.setUserId(hanHaiMember.getId());
+        hotelLeaseLog.setShopId(hotelLeaseLog.getShopId());
+        hotelLeaseLog.setLeaseFlag(0);
+        hotelLeaseLog.setStatus(0);
+        hotelLeaseLog.setSku(uploadTableclothReq.getLength()+"*"+uploadTableclothReq.getWide());
+        hotelLeaseLogService.save(hotelLeaseLog);
+
+
+        return Result.OK();
+    }
+
+    @Override
+    public Result<?> confirmAcceptOrder(ConfirmAcceptOrderReq confirmAcceptOrderReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(confirmAcceptOrderReq.getToken());
+
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getShopId,hanHaiMember.getId())
+                .eq(HotelOrder::getId, confirmAcceptOrderReq.getId())
+                .one();
+        HotelOrder hotelOrder1 = new HotelOrder();
+        hotelOrder1.setId(hotelOrder.getId());
+
+        if(confirmAcceptOrderReq.getFlag() == 0){
+            switch (hotelOrder.getType()){
+                case 1:
+                    hotelOrder1.setStatus(5);
+                    break;
+                case 2:
+                    hotelOrder1.setStatus(17);
+                    break;
+                case 3:
+                    hotelOrder1.setStatus(18);
+                    break;
+            }
+        }else if(confirmAcceptOrderReq.getFlag() == 1){
+            switch (hotelOrder.getStatus()){
+                case 5:
+                    hotelOrder1.setStatus(6);
+                    break;
+                case 6:
+                    hotelOrder1.setStatus(15);
+                    break;
+            }
 
         }
 
 
+        hotelOrderService.updateById(hotelOrder1);
+
         return Result.OK();
     }
 
+    @Override
+    public Result<?> cancelOrder(CancelOrderReq cancelOrderReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(cancelOrderReq.getToken());
+        HotelOrder hotelOrder = hotelOrderService.lambdaQuery()
+                .eq(HotelOrder::getDelFlag, 0)
+                .in(HotelOrder::getStatus, 0, 3)
+                .eq(HotelOrder::getId, cancelOrderReq.getId())
+                .one();
+        if(hotelOrder == null){
+            throw new JeecgBootException("未找到该订单");
+        }
+
+        return null;
+    }
+
     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 6fafe90..a1afb21 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
@@ -70,4 +70,11 @@ public class ShopController {
         editShopJobTimeReq.setToken(TokenUtils.getTokenByRequest(request));
         return shopService.editShopJobTime(editShopJobTimeReq);
     }
+
+    @ApiOperation(value = "绑定微信")
+    @PostMapping("/bind/wx")
+    public Result<?> bindWx(HttpServletRequest request, BindWxReq bindWxReq){
+        bindWxReq.setToken(TokenUtils.getTokenByRequest(request));
+        return shopService.bindWx(bindWxReq);
+    }
 }
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 0d5c6c6..a9856a3 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
@@ -19,6 +19,7 @@ public class ApplyShopReq {
     private String latitude;
     private String longitude;
     private String address;
+    private String password;
     private String token;
 
 
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/BindWxReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/BindWxReq.java
new file mode 100644
index 0000000..3ee4546
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/shop/req/BindWxReq.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.xcx.shop.req;
+
+import lombok.Data;
+
+@Data
+public class BindWxReq {
+
+    private String token;
+    private String code;
+
+}
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 30cf0cd..02963b8 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
@@ -55,4 +55,12 @@ public interface IShopService {
      */
     Result<?> editShopJobTime(EditShopJobTimeReq editShopJobTimeReq);
 
+    /**
+     * 绑定微信
+     * @param bindWxReq
+     * @return
+     */
+    Result<?> bindWx(BindWxReq bindWxReq);
+
+
 }
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 c75cfce..6547c46 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
@@ -1,12 +1,16 @@
 package org.jeecg.modules.xcx.shop.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.bean.HttpConf;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.resp.MyUserResp;
 import org.jeecg.modules.hanHaiMember.resp.ShopIndexResp;
@@ -20,6 +24,7 @@ import org.jeecg.modules.hotelshop.entity.HotelShop;
 import org.jeecg.modules.hotelshop.service.IHotelShopService;
 import org.jeecg.modules.xcx.shop.req.*;
 import org.jeecg.modules.xcx.shop.service.IShopService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -41,7 +46,21 @@ public class ShopServiceImpl implements IShopService {
     private IHotelMemberAccountService hotelMemberAccountService;
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
+    @Resource
+    private HttpConf httpConf;
+    /**
+     * 微信公众号-appid
+     */
+    @Value("${weixin.mpAppId}")
+    private String mpAppId;
+
+    /**
+     * 微信公众号-appSecret
+     */
+    @Value("${weixin.mpAppSecret}")
+    private String mpAppSecret;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Result<?> applyShop(ApplyShopReq applyShopReq) {
         Integer n = (Integer) redisUtil.get("apply:shop:"+applyShopReq.getToken());
@@ -65,6 +84,9 @@ public class ShopServiceImpl implements IShopService {
         if (StringUtils.isBlank(applyShopReq.getAddress())){
             throw new JeecgBootException("请填写地址");
         }
+        if(StringUtils.isBlank(applyShopReq.getPassword())){
+            throw new JeecgBootException("请输入密码");
+        }
         HotelShop hotelShop = hotelShopService.lambdaQuery()
                 .eq(HotelShop::getDelFlag, 0)
                 .eq(HotelShop::getUserId, hanHaiMember.getId())
@@ -73,6 +95,15 @@ public class ShopServiceImpl implements IShopService {
         if(hotelShop != null){
             throw new JeecgBootException("您已申请过店铺，请勿重复申请");
         }
+
+        String salt = oConvertUtils.randomGen(8);
+        String encrypt = PasswordUtil.encrypt(applyShopReq.getPassword(), applyShopReq.getPhone(), salt);
+        HanHaiMember hanHaiMember1 = new HanHaiMember();
+        hanHaiMember1.setId(hanHaiMember.getId());
+        hanHaiMember1.setPassword(encrypt);
+        hanHaiMember1.setPasswordSalt(salt);
+        hanHaiMemberService.updateById(hanHaiMember1);
+
         HotelShop hotelShop1 = new HotelShop();
         hotelShop1.setUserId(hanHaiMember.getId());
         hotelShop1.setName(applyShopReq.getName());
@@ -222,4 +253,34 @@ public class ShopServiceImpl implements IShopService {
         return Result.OK();
     }
 
+    @Override
+    public Result<?> bindWx(BindWxReq bindWxReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(bindWxReq.getToken());
+        if(StringUtils.isNotBlank(hanHaiMember.getAppletOpenid())){
+            throw new JeecgBootException("您已绑定过微信");
+        }
+        if (org.apache.commons.lang.StringUtils.isBlank(bindWxReq.getCode())) {
+            throw new JeecgBootException("小程序code为空");
+        }
+        String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret+ "&js_code=" + bindWxReq.getCode() + "&grant_type=authorization_code";
+        //使用工具类
+        JSONObject json_test = httpConf.getJSONObject(loginUrl);
+        String wxOpenid = json_test.getString("openid");
+        String sessionKey = json_test.getString("session_key");
+        if (org.apache.commons.lang.StringUtils.isBlank(wxOpenid)) {
+            throw new JeecgBootException("未获取到openid");
+        }
+        HanHaiMember hanHaiMember2 = hanHaiMemberService.lambdaQuery()
+                .eq(HanHaiMember::getAppletOpenid, wxOpenid)
+                .one();
+        if(hanHaiMember2 != null){
+            throw new JeecgBootException("该微信已注册，无法绑定");
+        }
+        HanHaiMember hanHaiMember1 = new HanHaiMember();
+        hanHaiMember1.setId(hanHaiMember.getId());
+        hanHaiMember1.setAppletOpenid(wxOpenid);
+        hanHaiMemberService.updateById(hanHaiMember1);
+        return Result.OK();
+    }
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/req/MyLeasePageReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/req/MyLeasePageReq.java
index d38118d..4424b1c 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/req/MyLeasePageReq.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/req/MyLeasePageReq.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.xcx.user.req;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -8,6 +9,10 @@ public class MyLeasePageReq {
     private Integer pageNo = 1;
     private Integer pageSize = 10;
     private String token;
+    @ApiModelProperty(value = "是否租赁 0否 1是")
+    private Integer leaseFlag;
+    @ApiModelProperty(value = "0正常 1换货 2退货")
+    private Integer status;
 
 
 }
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 f551f8c..ae9fe32 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
@@ -74,65 +74,66 @@ public class LoginServiceImpl implements ILoginService {
     public Result<?> officialLogin(LoginReq loginReq){
         Result<Object> result = new Result<>();
         Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isBlank(loginReq.getCode())) {
-            throw new JeecgBootException("小程序code为空");
-        }
-        String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret+ "&js_code=" + loginReq.getCode() + "&grant_type=authorization_code";
-        //使用工具类
-        JSONObject json_test = httpConf.getJSONObject(loginUrl);
-        String wxOpenid = json_test.getString("openid");
-        String sessionKey = json_test.getString("session_key");
-        if (StringUtils.isBlank(wxOpenid)) {
-            throw new JeecgBootException("未获取到openid");
-        }
-
-        HanHaiMember member = memberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,wxOpenid).one();
-        if (member == null) {
-            if (loginReq.getLatitude() == null || loginReq.getLatitude() == 0 || loginReq.getLongitude() == null || loginReq.getLongitude() == 0){
-                throw new JeecgBootException("请授权定位信息");
+        if(loginReq.getLoginType() == 0){
+            if (StringUtils.isBlank(loginReq.getCode())) {
+                throw new JeecgBootException("小程序code为空");
             }
-            HotelShop hotelShop = hotelShopService.getDistance(loginReq.getLatitude(), loginReq.getLongitude());
-            if(hotelShop == null){
-                throw new JeecgBootException("目前无水洗店可绑定，请联系客服处理");
+            String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret+ "&js_code=" + loginReq.getCode() + "&grant_type=authorization_code";
+            //使用工具类
+            JSONObject json_test = httpConf.getJSONObject(loginUrl);
+            String wxOpenid = json_test.getString("openid");
+            String sessionKey = json_test.getString("session_key");
+            if (StringUtils.isBlank(wxOpenid)) {
+                throw new JeecgBootException("未获取到openid");
             }
-            //如果user等于null说明该用户第一次登录，数据库没有该用户信息。
-            loginReq.setOpenid(wxOpenid);
-            loginReq.setSession_key(sessionKey);
-            member = new HanHaiMember();
+
+            HanHaiMember member = memberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,wxOpenid).one();
+            if (member == null) {
+                if (loginReq.getLatitude() == null || loginReq.getLatitude() == 0 || loginReq.getLongitude() == null || loginReq.getLongitude() == 0){
+                    throw new JeecgBootException("请授权定位信息");
+                }
+                HotelShop hotelShop = hotelShopService.getDistance(loginReq.getLatitude(), loginReq.getLongitude());
+                if(hotelShop == null){
+                    throw new JeecgBootException("目前无水洗店可绑定，请联系客服处理");
+                }
+                //如果user等于null说明该用户第一次登录，数据库没有该用户信息。
+                loginReq.setOpenid(wxOpenid);
+                loginReq.setSession_key(sessionKey);
+                member = new HanHaiMember();
 //            member.setSesssionKey(sessionKey);
-            member.setAppletOpenid(wxOpenid);
-            member.setNickName(loginReq.getNickName());
-            member.setHeadImage(loginReq.getHeadimgurl());
-            member.setShopId(hotelShop.getId());
-            // 生成token返回给小程序端
-            String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
-            memberService.save(member);
-            HotelMemberAccount hotelMemberAccount = new HotelMemberAccount();
-            hotelMemberAccount.setUserId(member.getId());
-            hotelMemberAccountService.save(hotelMemberAccount);
-            redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-            // 设置超时时间
-            redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
-            map.put("userInfo", member);
-            map.put("token", token);
+                member.setAppletOpenid(wxOpenid);
+                member.setNickName(loginReq.getNickName());
+                member.setHeadImage(loginReq.getHeadimgurl());
+                member.setShopId(hotelShop.getId());
+                // 生成token返回给小程序端
+                String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
+                memberService.save(member);
+                HotelMemberAccount hotelMemberAccount = new HotelMemberAccount();
+                hotelMemberAccount.setUserId(member.getId());
+                hotelMemberAccountService.save(hotelMemberAccount);
+                redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+                // 设置超时时间
+                redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
+                map.put("userInfo", member);
+                map.put("token", token);
 
-            result.setCode(200);
-            result.setResult(map);
-            return result;
-        } else {
+                result.setCode(200);
+                result.setResult(map);
+                return result;
+            } else {
 //            member.setHeadImage(loginReq.getHeadimgurl());
 //            member.setSessionKey(sessionKey);
 //            memberService.saveOrUpdate(member);
-            // 生成token返回给小程序端
-            String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
-            redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-            // 设置超时时间
-            redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
-            map.put("userInfo", member);
-            map.put("token", token);
-            //用户id做im账号
-            result.setResult(map);
-            result.setCode(200);
+                // 生成token返回给小程序端
+                String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
+                redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+                // 设置超时时间
+                redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
+                map.put("userInfo", member);
+                map.put("token", token);
+                //用户id做im账号
+                result.setResult(map);
+                result.setCode(200);
 //            result.setMessage(member.getNickName()+"已于"+member.getCreateTime()+"注册成功！请勿重复注册！");
 //            // 未绑定手机号，跳转授权绑定手机号
 //            if (StringUtils.isBlank(member.getPhone())) {
@@ -141,7 +142,43 @@ public class LoginServiceImpl implements ILoginService {
 //                result.setResult(map);
 //                return result;
 //            }
+            }
+        }else{
+            if(org.apache.commons.lang3.StringUtils.isBlank(loginReq.getAccount())){
+                throw new JeecgBootException("请输入账号");
+            }
+            if(org.apache.commons.lang3.StringUtils.isBlank(loginReq.getPassword())){
+                throw new JeecgBootException("请输入密码");
+            }
+            HanHaiMember hanHaiMember = hanHaiMemberService.lambdaQuery()
+                    .eq(HanHaiMember::getPhone, loginReq.getAccount())
+                    .one();
+
+            if(hanHaiMember == null){
+                throw new JeecgBootException("账号未注册");
+            }
+
+            String encrypt = PasswordUtil.encrypt(loginReq.getPassword(), loginReq.getAccount(), hanHaiMember.getPasswordSalt());
+            if(!org.apache.commons.lang3.StringUtils.equals(encrypt,hanHaiMember.getPassword())){
+                throw new JeecgBootException("密码不正确");
+            }
+
+            HotelShop hotelShop = hotelShopService.lambdaQuery()
+                    .eq(HotelShop::getDelFlag, 0)
+                    .eq(HotelShop::getUserId, hanHaiMember.getId())
+                    .one();
+            hanHaiMember.setShop(hotelShop);
+            String token = JwtUtil.sign(hanHaiMember.getPhone(), hanHaiMember.getPassword());
+            redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+            // 设置超时时间
+            redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
+            map.put("userInfo", hanHaiMember);
+            map.put("token", token);
+            //用户id做im账号
+            result.setResult(map);
+            result.setCode(200);
         }
+
         return result;
     }
 }
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 8560f95..d717409 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
@@ -1,5 +1,6 @@
 package org.jeecg.modules.xcx.user.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -75,12 +76,12 @@ public class UserServiceImpl implements IUserService {
 
 
         Page<HotelLeaseLog> page = new Page<>(myLeasePageReq.getPageNo(), myLeasePageReq.getPageSize());
-
-        Page<HotelLeaseLog> hotelLeaseLogPage = hotelLeaseLogService.lambdaQuery()
-                .eq(HotelLeaseLog::getDelFlag, 0)
-                .eq(HotelLeaseLog::getUserId, hanHaiMember.getId())
-                .orderByDesc(HotelLeaseLog::getCreateTime)
-                .page(page);
+        IPage<HotelLeaseLog> hotelLeaseLogPage = hotelLeaseLogService.myLeaseLogPage(page, hanHaiMember.getId(), myLeasePageReq.getLeaseFlag(),myLeasePageReq.getStatus());
+//        Page<HotelLeaseLog> hotelLeaseLogPage = hotelLeaseLogService.lambdaQuery()
+//                .eq(HotelLeaseLog::getDelFlag, 0)
+//                .eq(HotelLeaseLog::getUserId, hanHaiMember.getId())
+//                .orderByDesc(HotelLeaseLog::getCreateTime)
+//                .page(page);
 
         return Result.OK(hotelLeaseLogPage);
     }
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 e979bf8..b91bd11 100644
--- a/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -169,8 +169,9 @@ mybatis-plus:
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
+
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
diff --git a/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java b/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
index cdcde94..703d6f5 100644
--- a/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
+++ b/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.system.test;
 
 import org.jeecg.JeecgSystemApplication;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.util.DateUtils2;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RestUtil;
@@ -16,6 +17,8 @@ import org.springframework.http.MediaType;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.http.ResponseEntity;
 
+import java.util.Date;
+
 /**
  * 系统用户单元测试
  */
@@ -187,7 +190,8 @@ public class SysUserTest {
     }
     @Test
     public void Test4(){
-        System.out.println(this.getDistance(12610325.24929662,3240104.8254822833,26.07421,119.29647));
+        Long untilDay = DateUtils2.getUntilDay(new Date("2024-10-09"), new Date(DateUtils2.getNowDateStrings()));
+        System.out.println(untilDay);
     }
 
     public  Double getDistance(double longitude1,double latitude1,double longitude2,double latitude2){