修复代码

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-pc/src/views/commonBanner/CommonBannerList.vue

@@ -0,0 +1,218 @@
+<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('公共轮播图')">导出</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>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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>
+
+    <common-banner-modal ref="modalForm" @ok="modalFormOk"></common-banner-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonBannerModal from './modules/CommonBannerModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonBannerList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonBannerModal
+    },
+    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: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'关联旅行',
+            align:"center",
+            dataIndex: 'travelId_dictText'
+          },
+          {
+            title:'关联活动',
+            align:"center",
+            dataIndex: 'activityId_dictText'
+          },
+          {
+            title:'排序',
+            align:"center",
+            sorter: true,
+            dataIndex: 'sort'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'是否启用',
+            align:"center",
+            dataIndex: 'isOpen',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
+          },
+          {
+            title:'跳转位置',
+            align:"center",
+            dataIndex: 'toCheck_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonBanner/commonBanner/list",
+          delete: "/commonBanner/commonBanner/delete",
+          deleteBatch: "/commonBanner/commonBanner/deleteBatch",
+          exportXlsUrl: "/commonBanner/commonBanner/exportXls",
+          importExcelUrl: "commonBanner/commonBanner/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'sel_search',value:'travelId',text:'关联旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'no_yu'})
+        fieldList.push({type:'switch',value:'isOpen',text:'是否启用'})
+        fieldList.push({type:'int',value:'toCheck',text:'跳转位置',dictCode:'to_go'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue

@@ -0,0 +1,327 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="订单状态">
+              <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.state" dictCode="order_state"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型">
+              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="order_type"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="用户标识">
+                <j-search-select-tag placeholder="请选择用户标识" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </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('订单列表')">导出</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>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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>
+
+    <popularize-order-modal ref="modalForm" @ok="modalFormOk"></popularize-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeOrderModal from './modules/PopularizeOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'PopularizeOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeOrderModal
+    },
+    data () {
+      return {
+        description: '订单列表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'订单状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'订单标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'订单图片',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'时间',
+            align:"center",
+            dataIndex: 'startTime'
+          },
+          {
+            title:'地点',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'是否签到',
+            align:"center",
+            dataIndex: 'open',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['open'], text) : ''),
+          },
+          {
+            title:'溯源活动',
+            align:"center",
+            dataIndex: 'activityOrderId_dictText'
+          },
+          {
+            title:'溯源旅行',
+            align:"center",
+            dataIndex: 'travelOrderId_dictText'
+          },
+          {
+            title:'用户标识',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'支付金额',
+            align:"center",
+            dataIndex: 'payPrice'
+          },
+          {
+            title:'支付时间',
+            align:"center",
+            dataIndex: 'payTime'
+          },
+          {
+            title:'购票数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'是否已开票',
+            align:"center",
+            dataIndex: 'isFp',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isFp'], text) : ''),
+          },
+          {
+            title:'是否已评价',
+            align:"center",
+            dataIndex: 'isPj',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPj'], text) : ''),
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'typePrice'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'邀请码',
+            align:"center",
+            dataIndex: 'code'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeOrder/popularizeOrder/list",
+          delete: "/popularizeOrder/popularizeOrder/delete",
+          deleteBatch: "/popularizeOrder/popularizeOrder/deleteBatch",
+          exportXlsUrl: "/popularizeOrder/popularizeOrder/exportXls",
+          importExcelUrl: "popularizeOrder/popularizeOrder/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'open', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+      this.$set(this.dictOptions, 'isFp', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+      this.$set(this.dictOptions, 'isPj', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'state',text:'订单状态',dictCode:'order_state'})
+        fieldList.push({type:'Text',value:'title',text:'订单标题',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'订单图片',dictCode:''})
+        fieldList.push({type:'string',value:'type',text:'类型',dictCode:'order_type'})
+        fieldList.push({type:'datetime',value:'startTime',text:'时间'})
+        fieldList.push({type:'Text',value:'address',text:'地点',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'switch',value:'open',text:'是否签到'})
+        fieldList.push({type:'sel_search',value:'activityOrderId',text:'溯源活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'travelOrderId',text:'溯源旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'BigDecimal',value:'payPrice',text:'支付金额',dictCode:''})
+        fieldList.push({type:'datetime',value:'payTime',text:'支付时间'})
+        fieldList.push({type:'int',value:'num',text:'购票数量',dictCode:''})
+        fieldList.push({type:'switch',value:'isFp',text:'是否已开票'})
+        fieldList.push({type:'switch',value:'isPj',text:'是否已评价'})
+        fieldList.push({type:'int',value:'typePrice',text:'类型',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'code',text:'邀请码',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-pc/src/views/popularizeOrder/modules/PopularizeOrderForm.vue

@@ -0,0 +1,199 @@
+<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="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入订单标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </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="order_type" 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="address">
+              <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="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否签到" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="open">
+              <j-switch v-model="model.open"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="溯源活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityOrderId">
+              <j-search-select-tag v-model="model.activityOrderId" dict="popularize_activity,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="溯源旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelOrderId">
+              <j-search-select-tag v-model="model.travelOrderId" dict="popularize_travel,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="支付金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payPrice">
+              <a-input-number v-model="model.payPrice" placeholder="请输入支付金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="支付时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTime">
+              <j-date placeholder="请选择支付时间"  v-model="model.payTime" :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="num">
+              <a-input-number v-model="model.num" placeholder="请输入购票数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否已开票" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isFp">
+              <j-switch v-model="model.isFp"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否已评价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPj">
+              <j-switch v-model="model.isPj"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typePrice">
+              <a-input-number v-model="model.typePrice" placeholder="请输入类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <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="phone">
+              <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="code">
+              <a-input v-model="model.code" placeholder="请输入邀请码"  ></a-input>
+            </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: 'PopularizeOrderForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/popularizeOrder/popularizeOrder/add",
+          edit: "/popularizeOrder/popularizeOrder/edit",
+          queryById: "/popularizeOrder/popularizeOrder/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>

admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <popularize-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-order-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import PopularizeOrderForm from './PopularizeOrderForm'
+
+  export default {
+    name: 'PopularizeOrderModal',
+    components: {
+      PopularizeOrderForm
+    },
+    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>

admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.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="关闭">
+    <popularize-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import PopularizeOrderForm from './PopularizeOrderForm'
+  export default {
+    name: 'PopularizeOrderModal',
+    components: {
+      PopularizeOrderForm
+    },
+    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>

admin-pc/src/views/popularizeTravel/PopularizeTravelList.vue

@@ -0,0 +1,321 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="中文-旅行标题">
+              <a-input placeholder="请输入中文-旅行标题" v-model="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="英文-旅行标题">
+              <a-input placeholder="请输入英文-旅行标题" v-model="queryParam.enTitle"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="开始时间">
+                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model="queryParam.startTime"></j-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="中文-旅行地址">
+                <a-input placeholder="请输入中文-旅行地址" v-model="queryParam.address"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="英文-旅行地址">
+                <a-input placeholder="请输入英文-旅行地址" v-model="queryParam.enAddress"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="主理人">
+                <j-search-select-tag placeholder="请选择主理人" v-model="queryParam.adminUser" dict="han_hai_member,nick_name,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="活动状态">
+                <j-dict-select-tag placeholder="请选择活动状态" v-model="queryParam.state" dictCode="no_state"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </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('旅行信息表')">导出</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>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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>
+
+    <popularize-travel-modal ref="modalForm" @ok="modalFormOk"></popularize-travel-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeTravelModal from './modules/PopularizeTravelModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'PopularizeTravelList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeTravelModal
+    },
+    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: 'createBy'
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'中文-旅行标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'英文-旅行标题',
+            align:"center",
+            dataIndex: 'enTitle'
+          },
+          {
+            title:'旅行封面',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'开始时间',
+            align:"center",
+            dataIndex: 'startTime'
+          },
+          {
+            title:'中文-旅行地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'英文-旅行地址',
+            align:"center",
+            dataIndex: 'enAddress'
+          },
+          {
+            title:'活动人数',
+            align:"center",
+            sorter: true,
+            dataIndex: 'sum'
+          },
+          {
+            title:'报名人数',
+            align:"center",
+            sorter: true,
+            dataIndex: 'num'
+          },
+          {
+            title:'报名价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'主理人',
+            align:"center",
+            dataIndex: 'adminUser_dictText'
+          },
+          {
+            title:'是否上架',
+            align:"center",
+            dataIndex: 'isOpen',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
+          },
+          {
+            title:'活动状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'签到人数',
+            align:"center",
+            sorter: true,
+            dataIndex: 'doNum'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeTravel/popularizeTravel/list",
+          delete: "/popularizeTravel/popularizeTravel/delete",
+          deleteBatch: "/popularizeTravel/popularizeTravel/deleteBatch",
+          exportXlsUrl: "/popularizeTravel/popularizeTravel/exportXls",
+          importExcelUrl: "popularizeTravel/popularizeTravel/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'title',text:'中文-旅行标题',dictCode:''})
+        fieldList.push({type:'string',value:'enTitle',text:'英文-旅行标题',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'旅行封面',dictCode:''})
+        fieldList.push({type:'datetime',value:'startTime',text:'开始时间'})
+        fieldList.push({type:'Text',value:'address',text:'中文-旅行地址',dictCode:''})
+        fieldList.push({type:'Text',value:'enAddress',text:'英文-旅行地址',dictCode:''})
+        fieldList.push({type:'int',value:'sum',text:'活动人数',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'报名人数',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'报名价格',dictCode:''})
+        fieldList.push({type:'sel_search',value:'adminUser',text:'主理人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'switch',value:'isOpen',text:'是否上架'})
+        fieldList.push({type:'int',value:'state',text:'活动状态',dictCode:'no_state'})
+        fieldList.push({type:'Text',value:'iconImage',text:'详情图',dictCode:''})
+        fieldList.push({type:'Text',value:'js',text:'中文-介绍说明',dictCode:''})
+        fieldList.push({type:'Text',value:'enJs',text:'英文-介绍说明',dictCode:''})
+        fieldList.push({type:'Text',value:'lx',text:'中文-路线说明',dictCode:''})
+        fieldList.push({type:'Text',value:'enLx',text:'英文-路线说明',dictCode:''})
+        fieldList.push({type:'Text',value:'fy',text:'中文-费用说明',dictCode:''})
+        fieldList.push({type:'Text',value:'enFy',text:'英文-费用说明',dictCode:''})
+        fieldList.push({type:'Text',value:'xz',text:'中文-需知说明',dictCode:''})
+        fieldList.push({type:'Text',value:'enXz',text:'英文-需知说明',dictCode:''})
+        fieldList.push({type:'Text',value:'dl',text:'中文-代理说明',dictCode:''})
+        fieldList.push({type:'Text',value:'enDl',text:'英文-代理说明',dictCode:''})
+        fieldList.push({type:'int',value:'doNum',text:'签到人数',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue → admin-pc/src/views/popularizeTravel/modules/PopularizeTravelForm.vue

@@ -40,7 +40,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="报名人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input-number v-model="model.num" placeholder="请输入报名人数" style="width: 100%" />
+              <a-input-number v-model="model.num" placeholder="请输入报名人数" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -53,11 +53,6 @@
               <j-search-select-tag v-model="model.adminUser" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="签到人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="openNum">
-              <a-input v-model="model.openNum" placeholder="请输入签到人数"  ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="是否上架" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
               <j-switch v-model="model.isOpen"  ></j-switch>
@@ -85,47 +80,47 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="中文-路线说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lx">
-              <a-textarea v-model="model.lx" rows="4" placeholder="请输入中文-路线说明" />
+              <j-editor v-model="model.lx" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="英文-路线说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enLx">
-              <a-textarea v-model="model.enLx" rows="4" placeholder="请输入英文-路线说明" />
+              <j-editor v-model="model.enLx" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="中文-费用说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fy">
-              <a-textarea v-model="model.fy" rows="4" placeholder="请输入中文-费用说明" />
+              <j-editor v-model="model.fy" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="英文-费用说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enFy">
-              <a-textarea v-model="model.enFy" rows="4" placeholder="请输入英文-费用说明" />
+              <j-editor v-model="model.enFy" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="中文-需知说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xz">
-              <a-textarea v-model="model.xz" rows="4" placeholder="请输入中文-需知说明" />
+              <j-editor v-model="model.xz" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="英文-需知说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enXz">
-              <a-textarea v-model="model.enXz" rows="4" placeholder="请输入英文-需知说明" />
+              <j-editor v-model="model.enXz" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="中文-代理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dl">
-              <a-textarea v-model="model.dl" rows="4" placeholder="请输入中文-代理说明" />
+              <j-editor v-model="model.dl" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="英文-代理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enDl">
-              <a-textarea v-model="model.enDl" rows="4" placeholder="请输入英文-代理说明" />
+              <j-editor v-model="model.enDl" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="签到人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="doNum">
-              <a-input-number v-model="model.doNum" placeholder="请输入签到人数" style="width: 100%" />
+              <a-input-number v-model="model.doNum" placeholder="请输入签到人数" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -165,6 +160,9 @@
         },
         confirmLoading: false,
         validatorRules: {
+           adminUser: [
+              { required: true, message: '请输入主理人!'},
+           ],
         },
         url: {
           add: "/popularizeTravel/popularizeTravel/add",

module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java

@@ -103,8 +103,8 @@ public class ApiOrderController {
             value="创建订单",
             notes="id：点击数据的标识")
     @PostMapping(value = "/createOrderPay")
-    public Result<?> createOrderPay(@RequestHeader("X-Access-Token") String token, String id,Integer num) {
-        return apiIndexService.createOrderPay(token,id,num);
+    public Result<?> createOrderPay(@RequestHeader("X-Access-Token") String token, String id,Integer num,String code) {
+        return apiIndexService.createOrderPay(token,id,num,code);
     }
 
 

module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java

@@ -102,7 +102,7 @@ public interface ApiIndexService {
 
 
     //创建订单支付
-    Result<?> createOrderPay(String token, String id,Integer num);
+    Result<?> createOrderPay(String token, String id,Integer num,String code);
 
 
 

module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java

@@ -14,7 +14,6 @@ import org.jeecg.modules.commonBanner.entity.CommonBanner;
 import org.jeecg.modules.commonBanner.service.ICommonBannerService;
 import org.jeecg.modules.commonIconImage.entity.CommonIconImage;
 import org.jeecg.modules.commonIconImage.service.ICommonIconImageService;
-import org.jeecg.modules.commonShop.entity.CommonShop;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.pay.MpWxPayService;
@@ -42,7 +41,6 @@ import org.jeecg.modules.popularizeSchool.entity.PopularizeSchool;
 import org.jeecg.modules.popularizeSchool.service.IPopularizeSchoolService;
 import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub;
 import org.jeecg.modules.popularizeSchoolSub.service.IPopularizeSchoolSubService;
-import org.jeecg.modules.popularizeSignLog.entity.PopularizeSignLog;
 import org.jeecg.modules.popularizeSignLog.service.IPopularizeSignLogService;
 import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
 import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService;
@@ -50,7 +48,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -115,7 +112,10 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     //获取首页banner
     @Override
     public Result<?> getBanner(){
-        List<CommonBanner> list = commonBannerService.list();
+        List<CommonBanner> list = commonBannerService
+                .lambdaQuery()
+                .orderByDesc(CommonBanner::getSort)
+                .list();
         return Result.OK(list);
     }
 
@@ -191,7 +191,10 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                             .ge(PopularizeOrder::getState, 1)
                             .list()
             );
-            recruitObj.setNum(recruitObj.getPopularizeOrderList().size());
+            //查询订单购票数量之和
+            Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId(), 1);
+            recruitObj.setNum(i);
+
             recruitList.add(recruitObj);
         }
 
@@ -309,7 +312,14 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                             .ge(PopularizeOrder::getState, 1)
                             .list()
             );
-            recruitObj.setNum(recruitObj.getOrderList().size());
+
+            //查询订单购票数量之和
+            Integer i = popularizeOrderService.sumNumByTravelOrderIdAndState(recruit.getId(), 1);
+            if(i == null){
+                i = 0;
+            }
+            recruitObj.setNum(i);
+
             recruitList.add(recruitObj);
         }
         page1.setRecords(recruitList);
@@ -1048,7 +1058,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     //创建订单支付
     @Override
-    public Result<?> createOrderPay(String token, String id,Integer num){
+    public Result<?> createOrderPay(String token, String id,Integer num,String code){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //标识不能为空
         if(StringUtils.isBlank(id)){
@@ -1068,6 +1078,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         }else{
             order.setPayPrice(order.getPrice().multiply(new BigDecimal(num)));
         }
+        order.setCode(code);
 
         popularizeOrderService.updateById(order);
         BigDecimal payPrice = order.getPayPrice();

module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue → module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/CommonBannerList.vue

@@ -146,6 +146,7 @@
           {
             title:'排序',
             align:"center",
+            sorter: true,
             dataIndex: 'sort'
           },
           {

module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerForm.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="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelId">
+              <j-search-select-tag v-model="model.travelId" dict="popularize_travel,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityId">
+              <j-search-select-tag v-model="model.activityId" dict="popularize_activity,title,id"  />
+            </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="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="no_yu" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
+              <j-switch v-model="model.isOpen"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="跳转位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toCheck">
+              <j-dict-select-tag type="list" v-model="model.toCheck" dictCode="to_go" 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: 'CommonBannerForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonBanner/commonBanner/add",
+          edit: "/commonBanner/commonBanner/edit",
+          queryById: "/commonBanner/commonBanner/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>

module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-banner-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-banner-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 CommonBannerForm from './CommonBannerForm'
+
+  export default {
+    name: 'CommonBannerModal',
+    components: {
+      CommonBannerForm
+    },
+    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>

module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.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="关闭">
+    <common-banner-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-banner-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonBannerForm from './CommonBannerForm'
+  export default {
+    name: 'CommonBannerModal',
+    components: {
+      CommonBannerForm
+    },
+    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>

module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Api(tags="公共轮播图")
@@ -66,7 +66,12 @@ public class CommonBannerController extends JeecgController<CommonBanner, ICommo
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CommonBanner> queryWrapper = QueryGenerator.initQueryWrapper(commonBanner, req.getParameterMap());
+//		QueryWrapper<CommonBanner> queryWrapper = QueryGenerator.initQueryWrapper(commonBanner, req.getParameterMap());
+//		//去掉默认按时间排序
+//		queryWrapper.lambda().orderByDesc(CommonBanner::getSort);
+
+		QueryWrapper<CommonBanner> queryWrapper = new QueryWrapper<>();
+		queryWrapper.orderByDesc("sort");
 		Page<CommonBanner> page = new Page<CommonBanner>(pageNo, pageSize);
 		IPage<CommonBanner> pageList = commonBannerService.page(page, queryWrapper);
 		return Result.OK(pageList);

module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Data

module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 public interface CommonBannerMapper extends BaseMapper<CommonBanner> {

module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 public interface ICommonBannerService extends IService<CommonBanner> {

module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts

@@ -28,6 +28,7 @@ export const columns: BasicColumn[] = [
    {
     title: '排序',
     align:"center",
+    sorter: true,
     dataIndex: 'sort'
    },
    {

module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.popularizeActivity.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -20,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
+import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,6 +52,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class PopularizeActivityController extends JeecgController<PopularizeActivity, IPopularizeActivityService> {
 	@Autowired
 	private IPopularizeActivityService popularizeActivityService;
+	 @Autowired
+	 private IPopularizeRecruitService popularizeRecruitService;
 	
 	/**
 	 * 分页列表查询
@@ -83,6 +88,31 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PopularizeActivity popularizeActivity) {
 		popularizeActivityService.save(popularizeActivity);
+
+		//增加招募记录
+		PopularizeRecruit byId = popularizeRecruitService.lambdaQuery()
+				.eq(PopularizeRecruit::getType,"0")
+				.eq(PopularizeRecruit::getActivityId,popularizeActivity.getId())
+				.one();
+		//如果不为空则增加
+		if(byId==null){
+			PopularizeRecruit recruit = new PopularizeRecruit();
+			recruit.setCreateBy(popularizeActivity.getCreateBy());
+			recruit.setCreateTime(new Date());
+			recruit.setTitle(popularizeActivity.getTitle());
+			recruit.setEnTitle(popularizeActivity.getEnTitle());
+			recruit.setImage(popularizeActivity.getImage());
+			recruit.setStartTime(popularizeActivity.getStartTime());
+			recruit.setAddress(popularizeActivity.getAddress());
+			recruit.setEnAddress(popularizeActivity.getEnAddress());
+			recruit.setIsOpen(popularizeActivity.getIsOpen());
+			recruit.setState(1);
+			recruit.setNum(0);
+			recruit.setType("0");
+			recruit.setTravelId(popularizeActivity.getId());
+			popularizeRecruitService.save(recruit);
+		}
+
 		return Result.OK("添加成功！");
 	}
 	
@@ -97,6 +127,44 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody PopularizeActivity popularizeActivity) {
 		popularizeActivityService.updateById(popularizeActivity);
+		//增加招募记录
+		PopularizeRecruit byId = popularizeRecruitService.lambdaQuery()
+				.eq(PopularizeRecruit::getType,"0")
+				.eq(PopularizeRecruit::getActivityId,popularizeActivity.getId())
+				.one();
+		//如果不为空则增加
+		if(byId==null){
+			PopularizeRecruit recruit = new PopularizeRecruit();
+			recruit.setCreateBy(popularizeActivity.getCreateBy());
+			recruit.setCreateTime(new Date());
+			recruit.setTitle(popularizeActivity.getTitle());
+			recruit.setEnTitle(popularizeActivity.getEnTitle());
+			recruit.setImage(popularizeActivity.getImage());
+			recruit.setStartTime(popularizeActivity.getStartTime());
+			recruit.setAddress(popularizeActivity.getAddress());
+			recruit.setEnAddress(popularizeActivity.getEnAddress());
+			recruit.setIsOpen(popularizeActivity.getIsOpen());
+			recruit.setState(1);
+			recruit.setNum(0);
+			recruit.setType("0");
+			recruit.setActivityId(popularizeActivity.getId());
+			popularizeRecruitService.save(recruit);
+		}else{
+			byId.setCreateBy(popularizeActivity.getCreateBy());
+			byId.setCreateTime(new Date());
+			byId.setTitle(popularizeActivity.getTitle());
+			byId.setEnTitle(popularizeActivity.getEnTitle());
+			byId.setImage(popularizeActivity.getImage());
+			byId.setStartTime(popularizeActivity.getStartTime());
+			byId.setAddress(popularizeActivity.getAddress());
+			byId.setEnAddress(popularizeActivity.getEnAddress());
+			byId.setIsOpen(popularizeActivity.getIsOpen());
+			byId.setState(1);
+			byId.setNum(0);
+			byId.setType("0");
+			byId.setActivityId(popularizeActivity.getId());
+			popularizeRecruitService.updateById(byId);
+		}
 		return Result.OK("编辑成功!");
 	}
 	

module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java

@@ -1,9 +1,6 @@
 package org.jeecg.modules.popularizeActivity.entity;
 
 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.IdType;
@@ -11,9 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
-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;

module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java

@@ -1,9 +1,6 @@
 package org.jeecg.modules.popularizeInvoicing.entity;
 
 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.IdType;
@@ -11,11 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
-import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
 import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
-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;

module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java

@@ -1,17 +1,10 @@
 package org.jeecg.modules.popularizeOrder.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.popularizeOrder.entity.PopularizeOrder;
 import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
 
@@ -20,18 +13,10 @@ 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;
@@ -39,7 +24,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-23
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Api(tags="订单列表")

module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java

@@ -1,15 +1,11 @@
 package org.jeecg.modules.popularizeOrder.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;
@@ -20,7 +16,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-23
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Data
@@ -132,4 +128,8 @@ public class PopularizeOrder implements Serializable {
 	@Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
     private java.lang.String phone;
+	/**邀请码*/
+	@Excel(name = "邀请码", width = 15)
+    @ApiModelProperty(value = "邀请码")
+    private java.lang.String code;
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java

@@ -1,8 +1,7 @@
 package org.jeecg.modules.popularizeOrder.mapper;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +13,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PopularizeOrderMapper extends BaseMapper<PopularizeOrder> {
 
+    @Select("SELECT SUM(num) FROM popularize_order WHERE activity_order_id = #{activityOrderId} AND state >= #{state}")
+    Integer sumNumByActivityOrderIdAndState(@Param("activityOrderId") String activityOrderId, @Param("state") Integer state);
+
+
+    @Select("SELECT SUM(num) FROM popularize_order WHERE travel_order_id = #{travelOrderId} AND state >= #{state}")
+    Integer sumNumByTravelOrderIdAndState(@Param("travelOrderId") String travelOrderId, @Param("state") Integer state);
+
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java

@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPopularizeOrderService extends IService<PopularizeOrder> {
 
+
+    Integer sumNumByActivityOrderIdAndState(String activityOrderId, Integer state);
+
+
+    Integer sumNumByTravelOrderIdAndState(String travelOrderId, Integer state);
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
@@ -16,4 +18,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class PopularizeOrderServiceImpl extends ServiceImpl<PopularizeOrderMapper, PopularizeOrder> implements IPopularizeOrderService {
 
+
+
+    @Resource
+    PopularizeOrderMapper popularizeOrderMapper;
+
+
+    @Override
+    public Integer sumNumByActivityOrderIdAndState(String activityOrderId, Integer state){
+        return popularizeOrderMapper.sumNumByActivityOrderIdAndState(activityOrderId,state);
+    }
+
+
+
+    @Override
+    public Integer sumNumByTravelOrderIdAndState(String travelOrderId, Integer state){
+        return popularizeOrderMapper.sumNumByTravelOrderIdAndState(travelOrderId,state);
+    }
+
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue

@@ -254,6 +254,11 @@
             align:"center",
             dataIndex: 'phone'
           },
+          {
+            title:'邀请码',
+            align:"center",
+            dataIndex: 'code'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -311,6 +316,7 @@
         fieldList.push({type:'int',value:'typePrice',text:'类型',dictCode:''})
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'code',text:'邀请码',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue

@@ -98,6 +98,11 @@
               <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="code">
+              <a-input v-model="model.code" placeholder="请输入邀请码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts

@@ -115,6 +115,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'phone'
    },
+   {
+    title: '邀请码',
+    align:"center",
+    dataIndex: 'code'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -266,4 +271,9 @@ export const formSchema: FormSchema[] = [
     field: 'phone',
     component: 'Input',
   },
+  {
+    label: '邀请码',
+    field: 'code',
+    component: 'Input',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 招募信息
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Api(tags="招募信息")

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 招募信息
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Data
@@ -96,8 +96,24 @@ public class PopularizeRecruit implements Serializable {
 	@Excel(name = "参与人数", width = 15)
     @ApiModelProperty(value = "参与人数")
     private java.lang.Integer num;
+	/**活动*/
+	@Excel(name = "活动", width = 15, dictTable = "popularize_activity", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "popularize_activity", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "活动")
+    private java.lang.String activityId;
+	/**旅行*/
+	@Excel(name = "旅行", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "旅行")
+    private java.lang.String travelId;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "vo_type")
+	@Dict(dicCode = "vo_type")
+    @ApiModelProperty(value = "类型")
+    private java.lang.String type;
 
 
     @TableField(exist = false)
     private List<PopularizeRecruitLog> popularizeRecruitLogList;
+
 }

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 招募信息
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 public interface PopularizeRecruitMapper extends BaseMapper<PopularizeRecruit> {

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 招募信息
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 public interface IPopularizeRecruitService extends IService<PopularizeRecruit> {

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 招募信息
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue

@@ -40,6 +40,16 @@
                 <j-dict-select-tag placeholder="请选择是否成行" v-model="queryParam.state" dictCode="is_xc"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="活动">
+                <j-search-select-tag placeholder="请选择活动" v-model="queryParam.activityId" dict="popularize_activity,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="旅行">
+                <j-search-select-tag placeholder="请选择旅行" v-model="queryParam.travelId" dict="popularize_travel,title,id"/>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -237,6 +247,21 @@
             align:"center",
             dataIndex: 'num'
           },
+          {
+            title:'活动',
+            align:"center",
+            dataIndex: 'activityId_dictText'
+          },
+          {
+            title:'旅行',
+            align:"center",
+            dataIndex: 'travelId_dictText'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -285,6 +310,9 @@
         fieldList.push({type:'switch',value:'isOpen',text:'是否上架 '})
         fieldList.push({type:'int',value:'state',text:'是否成行',dictCode:'is_xc'})
         fieldList.push({type:'int',value:'num',text:'参与人数',dictCode:''})
+        fieldList.push({type:'sel_search',value:'activityId',text:'活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'travelId',text:'旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'string',value:'type',text:'类型',dictCode:'vo_type'})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue

@@ -58,6 +58,21 @@
               <a-input-number v-model="model.num" placeholder="请输入参与人数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityId">
+              <j-search-select-tag v-model="model.activityId" dict="popularize_activity,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelId">
+              <j-search-select-tag v-model="model.travelId" dict="popularize_travel,title,id"  />
+            </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="vo_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts

@@ -74,6 +74,21 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'num'
    },
+   {
+    title: '活动',
+    align:"center",
+    dataIndex: 'activityId_dictText'
+   },
+   {
+    title: '旅行',
+    align:"center",
+    dataIndex: 'travelId_dictText'
+   },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -122,6 +137,24 @@ export const searchFormSchema: FormSchema[] = [
       },
       colProps: {span: 6},
  	},
+	{
+      label: "活动",
+      field: "activityId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"popularize_activity,title,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "旅行",
+      field: "travelId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"popularize_travel,title,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -187,4 +220,28 @@ export const formSchema: FormSchema[] = [
     field: 'num',
     component: 'InputNumber',
   },
+  {
+    label: '活动',
+    field: 'activityId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"popularize_activity,title,id"
+    },
+  },
+  {
+    label: '旅行',
+    field: 'travelId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"popularize_travel,title,id"
+    },
+  },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"vo_type"
+     },
+  },
 ];

module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.popularizeTravel.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -12,6 +13,8 @@ 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.popularizeRecruit.entity.PopularizeRecruit;
+import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
 import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
 import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService;
 
@@ -39,7 +42,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 旅行信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-13
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Api(tags="旅行信息表")
@@ -49,7 +52,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class PopularizeTravelController extends JeecgController<PopularizeTravel, IPopularizeTravelService> {
 	@Autowired
 	private IPopularizeTravelService popularizeTravelService;
-	
+	@Autowired
+	private IPopularizeRecruitService popularizeRecruitService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -83,6 +88,37 @@ public class PopularizeTravelController extends JeecgController<PopularizeTravel
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PopularizeTravel popularizeTravel) {
 		popularizeTravelService.save(popularizeTravel);
+
+		//增加招募记录
+		PopularizeRecruit byId = popularizeRecruitService.lambdaQuery()
+				.eq(PopularizeRecruit::getType,"1")
+				.eq(PopularizeRecruit::getTravelId,popularizeTravel.getId())
+				.one();
+		//如果不为空则增加
+		if(byId==null){
+			PopularizeRecruit recruit = new PopularizeRecruit();
+			recruit.setCreateBy(popularizeTravel.getCreateBy());
+			recruit.setCreateTime(new Date());
+			recruit.setTitle(popularizeTravel.getTitle());
+			recruit.setEnTitle(popularizeTravel.getEnTitle());
+			recruit.setImage(popularizeTravel.getImage());
+			recruit.setStartTime(popularizeTravel.getStartTime());
+			recruit.setAddress(popularizeTravel.getAddress());
+			recruit.setEnAddress(popularizeTravel.getEnAddress());
+			recruit.setIsOpen(popularizeTravel.getIsOpen());
+			recruit.setState(1);
+			recruit.setNum(0);
+			recruit.setType("1");
+			recruit.setTravelId(popularizeTravel.getId());
+			popularizeRecruitService.save(recruit);
+		}
+
+
+
+
+
+
+
 		return Result.OK("添加成功！");
 	}
 	
@@ -97,6 +133,46 @@ public class PopularizeTravelController extends JeecgController<PopularizeTravel
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody PopularizeTravel popularizeTravel) {
 		popularizeTravelService.updateById(popularizeTravel);
+
+		//增加招募记录
+		PopularizeRecruit byId = popularizeRecruitService.lambdaQuery()
+				.eq(PopularizeRecruit::getType,"1")
+				.eq(PopularizeRecruit::getTravelId,popularizeTravel.getId())
+				.one();
+		//如果不为空则增加
+		if(byId==null){
+			PopularizeRecruit recruit = new PopularizeRecruit();
+			recruit.setCreateBy(popularizeTravel.getCreateBy());
+			recruit.setCreateTime(new Date());
+			recruit.setTitle(popularizeTravel.getTitle());
+			recruit.setEnTitle(popularizeTravel.getEnTitle());
+			recruit.setImage(popularizeTravel.getImage());
+			recruit.setStartTime(popularizeTravel.getStartTime());
+			recruit.setAddress(popularizeTravel.getAddress());
+			recruit.setEnAddress(popularizeTravel.getEnAddress());
+			recruit.setIsOpen(popularizeTravel.getIsOpen());
+			recruit.setState(1);
+			recruit.setNum(0);
+			recruit.setType("1");
+			recruit.setTravelId(popularizeTravel.getId());
+			popularizeRecruitService.save(recruit);
+		}else{
+			byId.setCreateBy(popularizeTravel.getCreateBy());
+			byId.setCreateTime(new Date());
+			byId.setTitle(popularizeTravel.getTitle());
+			byId.setEnTitle(popularizeTravel.getEnTitle());
+			byId.setImage(popularizeTravel.getImage());
+			byId.setStartTime(popularizeTravel.getStartTime());
+			byId.setAddress(popularizeTravel.getAddress());
+			byId.setEnAddress(popularizeTravel.getEnAddress());
+			byId.setIsOpen(popularizeTravel.getIsOpen());
+			byId.setState(1);
+			byId.setNum(0);
+			byId.setType("1");
+			byId.setTravelId(popularizeTravel.getId());
+			popularizeRecruitService.updateById(byId);
+		}
+
 		return Result.OK("编辑成功!");
 	}
 	

module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java

@@ -1,9 +1,6 @@
 package org.jeecg.modules.popularizeTravel.entity;
 
 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.IdType;
@@ -11,9 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
-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;

module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 旅行信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-13
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 public interface PopularizeTravelMapper extends BaseMapper<PopularizeTravel> {

module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue → module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/PopularizeTravelList.vue

@@ -214,11 +214,13 @@
           {
             title:'活动人数',
             align:"center",
+            sorter: true,
             dataIndex: 'sum'
           },
           {
             title:'报名人数',
             align:"center",
+            sorter: true,
             dataIndex: 'num'
           },
           {
@@ -231,11 +233,6 @@
             align:"center",
             dataIndex: 'adminUser_dictText'
           },
-          {
-            title:'签到人数',
-            align:"center",
-            dataIndex: 'openNum'
-          },
           {
             title:'是否上架',
             align:"center",
@@ -250,6 +247,7 @@
           {
             title:'签到人数',
             align:"center",
+            sorter: true,
             dataIndex: 'doNum'
           },
           {
@@ -299,7 +297,6 @@
         fieldList.push({type:'int',value:'num',text:'报名人数',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'报名价格',dictCode:''})
         fieldList.push({type:'sel_search',value:'adminUser',text:'主理人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'string',value:'openNum',text:'签到人数',dictCode:''})
         fieldList.push({type:'switch',value:'isOpen',text:'是否上架'})
         fieldList.push({type:'int',value:'state',text:'活动状态',dictCode:'no_state'})
         fieldList.push({type:'Text',value:'iconImage',text:'详情图',dictCode:''})

module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelForm.vue

@@ -0,0 +1,222 @@
+<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="title">
+              <a-input v-model="model.title" placeholder="请输入中文-旅行标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="英文-旅行标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enTitle">
+              <a-input v-model="model.enTitle" placeholder="请输入英文-旅行标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="旅行封面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </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="address">
+              <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="enAddress">
+              <a-input v-model="model.enAddress" placeholder="请输入英文-旅行地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="活动人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sum">
+              <a-input-number v-model="model.sum" placeholder="请输入活动人数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="报名人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入报名人数" style="width: 100%" disabled/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="报名价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入报名价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adminUser">
+              <j-search-select-tag v-model="model.adminUser" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否上架" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
+              <j-switch v-model="model.isOpen"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="活动状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="no_state" placeholder="请选择活动状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详情图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iconImage">
+              <j-editor v-model="model.iconImage" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="中文-介绍说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="js">
+              <j-editor v-model="model.js" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="英文-介绍说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enJs">
+              <j-editor v-model="model.enJs" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="中文-路线说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lx">
+              <j-editor v-model="model.lx" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="英文-路线说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enLx">
+              <j-editor v-model="model.enLx" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="中文-费用说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fy">
+              <j-editor v-model="model.fy" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="英文-费用说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enFy">
+              <j-editor v-model="model.enFy" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="中文-需知说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xz">
+              <j-editor v-model="model.xz" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="英文-需知说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enXz">
+              <j-editor v-model="model.enXz" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="中文-代理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dl">
+              <j-editor v-model="model.dl" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="英文-代理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enDl">
+              <j-editor v-model="model.enDl" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="签到人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="doNum">
+              <a-input-number v-model="model.doNum" placeholder="请输入签到人数" style="width: 100%" disabled/>
+            </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: 'PopularizeTravelForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           adminUser: [
+              { required: true, message: '请输入主理人!'},
+           ],
+        },
+        url: {
+          add: "/popularizeTravel/popularizeTravel/add",
+          edit: "/popularizeTravel/popularizeTravel/edit",
+          queryById: "/popularizeTravel/popularizeTravel/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>

module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <popularize-travel-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-travel-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 PopularizeTravelForm from './PopularizeTravelForm'
+
+  export default {
+    name: 'PopularizeTravelModal',
+    components: {
+      PopularizeTravelForm
+    },
+    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>

module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.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="关闭">
+    <popularize-travel-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-travel-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import PopularizeTravelForm from './PopularizeTravelForm'
+  export default {
+    name: 'PopularizeTravelModal',
+    components: {
+      PopularizeTravelForm
+    },
+    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>

module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 旅行信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-13
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 public interface IPopularizeTravelService extends IService<PopularizeTravel> {

module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 旅行信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-13
+ * @Date:   2025-02-13
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts

@@ -49,11 +49,13 @@ export const columns: BasicColumn[] = [
    {
     title: '活动人数',
     align:"center",
+    sorter: true,
     dataIndex: 'sum'
    },
    {
     title: '报名人数',
     align:"center",
+    sorter: true,
     dataIndex: 'num'
    },
    {
@@ -66,11 +68,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'adminUser_dictText'
    },
-   {
-    title: '签到人数',
-    align:"center",
-    dataIndex: 'openNum'
-   },
    {
     title: '是否上架',
     align:"center",
@@ -87,6 +84,7 @@ export const columns: BasicColumn[] = [
    {
     title: '签到人数',
     align:"center",
+    sorter: true,
     dataIndex: 'doNum'
    },
 ];
@@ -187,6 +185,7 @@ export const formSchema: FormSchema[] = [
     label: '报名人数',
     field: 'num',
     component: 'InputNumber',
+    dynamicDisabled:true
   },
   {
     label: '报名价格',
@@ -200,11 +199,11 @@ export const formSchema: FormSchema[] = [
     componentProps:{
        dict:"han_hai_member,nick_name,id"
     },
-  },
-  {
-    label: '签到人数',
-    field: 'openNum',
-    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入主理人!'},
+          ];
+     },
   },
   {
     label: '是否上架',
@@ -239,46 +238,47 @@ export const formSchema: FormSchema[] = [
   {
     label: '中文-路线说明',
     field: 'lx',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '英文-路线说明',
     field: 'enLx',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '中文-费用说明',
     field: 'fy',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '英文-费用说明',
     field: 'enFy',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '中文-需知说明',
     field: 'xz',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '英文-需知说明',
     field: 'enXz',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '中文-代理说明',
     field: 'dl',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '英文-代理说明',
     field: 'enDl',
-    component: 'InputTextArea',//TODO 注意string转换问题
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '签到人数',
     field: 'doNum',
     component: 'InputNumber',
+    dynamicDisabled:true
   },
 ];

module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error:
@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 100MB
+      max-request-size: 100MB
   mail:
     host: smtp.qq.com
     username: