项目资料代码提交

.idea/compiler.xml

@@ -19,16 +19,16 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="base-api" options="" />
+      <module name="base-api" options="-parameters" />
       <module name="base-core" options="-parameters" />
       <module name="base-tools" options="-parameters" />
       <module name="jeecg-system-cloud-api" options="-parameters" />
       <module name="jeecg-system-local-api" options="-parameters" />
-      <module name="module-base" options="" />
+      <module name="module-base" options="-parameters" />
       <module name="module-common" options="-parameters" />
       <module name="module-pay" options="-parameters" />
       <module name="module-system" options="-parameters" />
-      <module name="popularize-admin" options="" />
+      <module name="popularize-admin" options="-parameters" />
     </option>
   </component>
 </project>

.idea/encodings.xml

@@ -3,10 +3,13 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-tools/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-pay/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
   </component>
 </project>

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8005/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=http://localhost:8001/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8005/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Api(tags="用户账户表")

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Data
@@ -52,9 +52,9 @@ public class HanHaiMember implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-	/**昵称*/
-	@Excel(name = "昵称", width = 15)
-    @ApiModelProperty(value = "昵称")
+	/**用户昵称*/
+	@Excel(name = "用户昵称", width = 15)
+    @ApiModelProperty(value = "用户昵称")
     private java.lang.String nickName;
 	/**用户头像*/
 	@Excel(name = "用户头像", width = 15)
@@ -202,7 +202,7 @@ public class HanHaiMember implements Serializable {
 	/**出生年*/
 	@Excel(name = "出生年", width = 15)
     @ApiModelProperty(value = "出生年")
-    private java.lang.Integer yearDate;
+    private java.lang.String yearDate;
 	/**地址*/
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
@@ -211,4 +211,32 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "可提现金额", width = 15)
     @ApiModelProperty(value = "可提现金额")
     private java.math.BigDecimal money;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String state;
+	/**国籍*/
+	@Excel(name = "国籍", width = 15)
+    @ApiModelProperty(value = "国籍")
+    private java.lang.String city;
+	/**邮箱*/
+	@Excel(name = "邮箱", width = 15)
+    @ApiModelProperty(value = "邮箱")
+    private java.lang.String email;
+	/**学历*/
+	@Excel(name = "学历", width = 15)
+    @ApiModelProperty(value = "学历")
+    private java.lang.String shcool;
+	/**院校类型*/
+	@Excel(name = "院校类型", width = 15)
+    @ApiModelProperty(value = "院校类型")
+    private java.lang.String shcoolType;
+	/**工作*/
+	@Excel(name = "工作", width = 15)
+    @ApiModelProperty(value = "工作")
+    private java.lang.String workValue;
+	/**关于我*/
+	@Excel(name = "关于我", width = 15)
+    @ApiModelProperty(value = "关于我")
+    private java.lang.String details;
 }

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Service

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -5,22 +5,10 @@
       <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.nickName"></a-input>
+            <a-form-item label="用户昵称">
+              <a-input placeholder="请输入用户昵称" v-model="queryParam.nickName"></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.shareId" dict="han_hai_member,nick_name,id"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="用户角色">
-                <j-dict-select-tag placeholder="请选择用户角色" v-model="queryParam.isPay" dictCode="member_role"/>
-              </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>
@@ -126,7 +114,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HanHaiMemberModal from './modules/HanHaiMemberModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'HanHaiMemberList',
@@ -155,7 +142,7 @@
             dataIndex: 'createTime'
           },
           {
-            title:'昵称',
+            title:'用户昵称',
             align:"center",
             dataIndex: 'nickName'
           },
@@ -166,24 +153,64 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'邀请人',
+            title:'手机号码',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'小程序标识',
+            align:"center",
+            dataIndex: 'appletOpenid'
+          },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'sex'
+          },
+          {
+            title:'出生年',
+            align:"center",
+            dataIndex: 'yearDate'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'state'
+          },
+          {
+            title:'国籍',
+            align:"center",
+            dataIndex: 'city'
+          },
+          {
+            title:'邮箱',
+            align:"center",
+            dataIndex: 'email'
+          },
+          {
+            title:'学历',
             align:"center",
-            dataIndex: 'shareId_dictText'
+            dataIndex: 'shcool'
           },
           {
-            title:'用户角色',
+            title:'院校类型',
             align:"center",
-            dataIndex: 'isPay_dictText'
+            dataIndex: 'shcoolType'
           },
           {
-            title:'余额',
+            title:'工作',
             align:"center",
-            dataIndex: 'price'
+            dataIndex: 'workValue'
           },
           {
-            title:'可提现金额',
+            title:'关于我',
             align:"center",
-            dataIndex: 'money'
+            dataIndex: 'details'
           },
           {
             title: '操作',
@@ -220,12 +247,20 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
+        fieldList.push({type:'string',value:'nickName',text:'用户昵称',dictCode:''})
         fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
-        fieldList.push({type:'sel_search',value:'shareId',text:'邀请人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'int',value:'isPay',text:'用户角色',dictCode:'member_role'})
-        fieldList.push({type:'BigDecimal',value:'price',text:'余额',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'money',text:'可提现金额',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
+        fieldList.push({type:'string',value:'appletOpenid',text:'小程序标识',dictCode:''})
+        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
+        fieldList.push({type:'string',value:'yearDate',text:'出生年',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'state',text:'状态',dictCode:''})
+        fieldList.push({type:'string',value:'city',text:'国籍',dictCode:''})
+        fieldList.push({type:'string',value:'email',text:'邮箱',dictCode:''})
+        fieldList.push({type:'string',value:'shcool',text:'学历',dictCode:''})
+        fieldList.push({type:'string',value:'shcoolType',text:'院校类型',dictCode:''})
+        fieldList.push({type:'string',value:'workValue',text:'工作',dictCode:''})
+        fieldList.push({type:'Text',value:'details',text:'关于我',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -4,8 +4,8 @@
       <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="nickName">
-              <a-input v-model="model.nickName" placeholder="请输入昵称"  ></a-input>
+            <a-form-model-item label="用户昵称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nickName">
+              <a-input v-model="model.nickName" placeholder="请输入用户昵称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -14,23 +14,63 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="邀请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">
-              <j-search-select-tag v-model="model.shareId" dict="han_hai_member,nick_name,id"  />
+            <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="isPay">
-              <j-dict-select-tag type="list" v-model="model.isPay" dictCode="member_role" placeholder="请选择用户角色" />
+            <a-form-model-item label="小程序标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="appletOpenid">
+              <a-input v-model="model.appletOpenid" 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 label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="可提现金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
-              <a-input-number v-model="model.money" placeholder="请输入可提现金额" style="width: 100%" />
+            <a-form-model-item label="出生年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearDate">
+              <a-input v-model="model.yearDate" placeholder="请输入出生年"  ></a-input>
+            </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="state">
+              <a-input v-model="model.state" placeholder="请输入状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="国籍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="city">
+              <a-input v-model="model.city" placeholder="请输入国籍"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
+              <a-input v-model="model.email" placeholder="请输入邮箱"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shcool">
+              <a-input v-model="model.shcool" placeholder="请输入学历"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="院校类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shcoolType">
+              <a-input v-model="model.shcoolType" placeholder="请输入院校类型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工作" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workValue">
+              <a-input v-model="model.workValue" placeholder="请输入工作"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关于我" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
+              <a-textarea v-model="model.details" rows="4" placeholder="请输入关于我" />
             </a-form-model-item>
           </a-col>
         </a-row>

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -10,7 +10,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'createTime'
    },
    {
-    title: '昵称',
+    title: '用户昵称',
     align:"center",
     dataIndex: 'nickName'
    },
@@ -21,57 +21,79 @@ export const columns: BasicColumn[] = [
     customRender:render.renderAvatar,
    },
    {
-    title: '邀请人',
+    title: '手机号码',
     align:"center",
-    dataIndex: 'shareId_dictText'
+    dataIndex: 'phone'
    },
    {
-    title: '用户角色',
+    title: '小程序标识',
     align:"center",
-    dataIndex: 'isPay_dictText'
+    dataIndex: 'appletOpenid'
    },
    {
-    title: '余额',
+    title: '性别',
     align:"center",
-    dataIndex: 'price'
+    dataIndex: 'sex'
    },
    {
-    title: '可提现金额',
+    title: '出生年',
     align:"center",
-    dataIndex: 'money'
+    dataIndex: 'yearDate'
+   },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'state'
+   },
+   {
+    title: '国籍',
+    align:"center",
+    dataIndex: 'city'
+   },
+   {
+    title: '邮箱',
+    align:"center",
+    dataIndex: 'email'
+   },
+   {
+    title: '学历',
+    align:"center",
+    dataIndex: 'shcool'
+   },
+   {
+    title: '院校类型',
+    align:"center",
+    dataIndex: 'shcoolType'
+   },
+   {
+    title: '工作',
+    align:"center",
+    dataIndex: 'workValue'
+   },
+   {
+    title: '关于我',
+    align:"center",
+    dataIndex: 'details'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "昵称",
+      label: "用户昵称",
       field: "nickName",
       component: 'Input',
       colProps: {span: 6},
  	},
-	{
-      label: "邀请人",
-      field: "shareId",
-      component: 'JSearchSelect',
-      componentProps:{
-         dict:"han_hai_member,nick_name,id"
-      },
-      colProps: {span: 6},
- 	},
-	{
-      label: "用户角色",
-      field: "isPay",
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode:"member_role"
-      },
-      colProps: {span: 6},
- 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '昵称',
+    label: '用户昵称',
     field: 'nickName',
     component: 'Input',
   },
@@ -83,29 +105,63 @@ export const formSchema: FormSchema[] = [
       },
   },
   {
-    label: '邀请人',
-    field: 'shareId',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"han_hai_member,nick_name,id"
-    },
+    label: '手机号码',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '小程序标识',
+    field: 'appletOpenid',
+    component: 'Input',
   },
   {
-    label: '用户角色',
-    field: 'isPay',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"member_role"
-     },
+    label: '性别',
+    field: 'sex',
+    component: 'Input',
   },
   {
-    label: '余额',
-    field: 'price',
-    component: 'InputNumber',
+    label: '出生年',
+    field: 'yearDate',
+    component: 'Input',
+  },
+  {
+    label: '地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '状态',
+    field: 'state',
+    component: 'Input',
+  },
+  {
+    label: '国籍',
+    field: 'city',
+    component: 'Input',
+  },
+  {
+    label: '邮箱',
+    field: 'email',
+    component: 'Input',
+  },
+  {
+    label: '学历',
+    field: 'shcool',
+    component: 'Input',
+  },
+  {
+    label: '院校类型',
+    field: 'shcoolType',
+    component: 'Input',
+  },
+  {
+    label: '工作',
+    field: 'workValue',
+    component: 'Input',
   },
   {
-    label: '可提现金额',
-    field: 'money',
-    component: 'InputNumber',
+    label: '关于我',
+    field: 'details',
+    component: 'InputTextArea',//TODO 注意string转换问题
   },
 ];

module-common/pom.xml

@@ -44,6 +44,18 @@
           <version>0.0.20131108.vaadin1</version>
           <scope>compile</scope>
       </dependency>
-	</dependencies>
+      <dependency>
+          <groupId>com.github.binarywang</groupId>
+          <artifactId>weixin-java-pay</artifactId>
+          <version>3.5.0</version>
+          <scope>compile</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.jeecgframework.boot</groupId>
+          <artifactId>module-pay</artifactId>
+          <version>3.2.0</version>
+          <scope>compile</scope>
+      </dependency>
+  </dependencies>
 
 </project>

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

@@ -47,8 +47,8 @@ public class ApiIndexController {
     //获取首页活动列表带分页
     @ApiOperation(value="获取首页活动列表带分页", notes="获取首页活动列表带分页")
     @GetMapping(value = "/getActivityPageList")
-    public Result<?> getActivityPageList(String title,PageBean pageBean) {
-        return apiIndexService.getActivityPageList(title, pageBean);
+    public Result<?> getActivityPageList(String title,String state,PageBean pageBean) {
+        return apiIndexService.getActivityPageList(title,state, pageBean);
     }
 
     //活动详情
@@ -61,8 +61,8 @@ public class ApiIndexController {
     //获取旅行列表带分页
     @ApiOperation(value="获取旅行列表带分页", notes="获取旅行列表带分页")
     @GetMapping(value = "/getTravelPageList")
-    public Result<?> getTravelPageList(String title, PageBean pageBean) {
-        return apiIndexService.getTravelPageList(title,  pageBean);
+    public Result<?> getTravelPageList(String title,String state, PageBean pageBean) {
+        return apiIndexService.getTravelPageList(title, state, pageBean);
     }
 
 
@@ -85,6 +85,14 @@ public class ApiIndexController {
 
 
 
+    //我主理的活动与旅行
+    @ApiOperation(value="我主理的活动与旅行", notes="我主理的活动与旅行")
+    @GetMapping(value = "/getTwoPageList")
+    public Result<?> getTwoPageList(@RequestHeader("X-Access-Token") String token,Integer type, PageBean pageBean) {
+        return apiIndexService.getTwoPageList(token, type, pageBean);
+    }
+
+
 
 
 }

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

@@ -25,8 +25,8 @@ public class ApiOrderController {
     //获取订单列表数据带分页
     @ApiOperation(value="获取订单列表数据带分页", notes="获取订单列表数据带分页")
     @GetMapping(value = "/getOrderPageList")
-    public Result<?> getOrderPageList(@RequestHeader("X-Access-Token") String token, PageBean pageBean) {
-        return apiIndexService.getOrderPageList(token, pageBean);
+    public Result<?> getOrderPageList(@RequestHeader("X-Access-Token") String token,String state ,PageBean pageBean) {
+        return apiIndexService.getOrderPageList(token,state, pageBean);
     }
 
 
@@ -61,6 +61,13 @@ public class ApiOrderController {
         return apiIndexService.evaluate(token,orderId,num,evaluate);
     }
 
+    //我的发票列表带分页
+    @ApiOperation(value="我的发票列表带分页", notes="我的发票列表带分页")
+    @GetMapping(value = "/getInvoicePageList")
+    public Result<?> getInvoicePageList(@RequestHeader("X-Access-Token") String token, PageBean pageBean) {
+        return apiIndexService.getInvoicePageList(token, pageBean);
+    }
+
 
     //订单开具发票
     @ApiOperation(value="订单开具发票", notes="订单开具发票")
@@ -79,5 +86,22 @@ public class ApiOrderController {
 
 
 
+    //创建订单
+    @ApiOperation(
+            value="创建订单",
+            notes="id：点击数据的标识")
+    @PostMapping(value = "/createOrder")
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, String id,Integer typePrice,Integer type) {
+        return apiIndexService.createOrder(token,id,typePrice,type);
+    }
+
+
+    //支付回调
+    //支付回调
+    @PostMapping("/payNotify")
+    public Object payNotify(@RequestBody String requestBody){
+        return apiIndexService.payNotify(requestBody);
+    }
+
 
 }

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

@@ -30,6 +30,13 @@ public class ApiShopUserController {
     }
 
 
+    //获取招募详情
+    @ApiOperation(value="获取招募详情", notes="获取招募详情")
+    @GetMapping(value = "/getRecruitInfo")
+    public Result<?> getRecruitInfo(String recruitId){
+        return apiIndexService.getRecruitInfo(recruitId);
+    }
+
 
     //主理人认证
     @ApiOperation(value="主理人认证", notes="主理人认证")
@@ -39,12 +46,19 @@ public class ApiShopUserController {
     }
 
 
+    //获取主理人认证信息
+    @ApiOperation(value="获取主理人认证信息", notes="获取主理人认证信息")
+    @GetMapping(value = "/getJoinRecruitInfo")
+    public Result<?> getJoinRecruitInfo(@RequestHeader("X-Access-Token") String token){
+        return apiIndexService.getJoinRecruitInfo(token);
+    }
+
 
     //主理人主理的活动列表带分页
     @ApiOperation(value="主理人主理的活动列表带分页", notes="主理人主理的活动列表带分页")
     @GetMapping(value = "/getActivityMemberPageList")
-    public Result<?> getActivityMemberPageList(@RequestHeader("X-Access-Token") String token, String title, PageBean pageBean){
-        return apiIndexService.getActivityMemberPageList(token,title, pageBean);
+    public Result<?> getActivityMemberPageList(@RequestHeader("X-Access-Token") String token, String title,Integer type, PageBean pageBean){
+        return apiIndexService.getActivityMemberPageList(token,title,type, pageBean);
     }
 
 
@@ -66,7 +80,7 @@ public class ApiShopUserController {
 
     //参与招募
     @ApiOperation(value="参与招募", notes="参与招募")
-    @GetMapping(value = "/shopUserAuth")
+    @PostMapping(value = "/shopUserAuth")
     public Result<?> shopUserAuth(@RequestHeader("X-Access-Token") String token,String recruitId){
         return apiIndexService.shopUserAuth(token,recruitId);
     }

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

@@ -3,6 +3,8 @@ package org.jeecg.api.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.api.bean.PageBean;
+import org.jeecg.api.service.ApiIndexService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -23,13 +25,41 @@ public class AppletMyInfoController {
     @Resource
     private ShiroRealm shiroRealm;
 
+    @Resource
+    private ApiIndexService apiIndexService;
     //修改个人信息
     @PostMapping(value = "/updateInfo")
     @ApiOperation(value="修改个人信息", notes="修改个人信息")
-    public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token,HanHaiMember member){
+    public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token,
+                                String nickName,
+                                String headImage,
+                                String phone,
+                                String email,
+                                String sex,
+                                String city,
+                                String yearDate,
+                                String address,
+                                String state,
+                                String shcool,
+                                String shcoolType,
+                                String workValue,
+                                String details
+    ){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        member.setId(hanHaiMember.getId());
-    	hanHaiMemberService.updateById(member);
+        hanHaiMember.setNickName(nickName);
+        hanHaiMember.setHeadImage(headImage);
+        hanHaiMember.setPhone(phone);
+        hanHaiMember.setEmail(email);
+        hanHaiMember.setSex(sex);
+        hanHaiMember.setCity(city);
+        hanHaiMember.setYearDate(yearDate);
+        hanHaiMember.setAddress(address);
+        hanHaiMember.setState(state);
+        hanHaiMember.setShcool(shcool);
+        hanHaiMember.setShcoolType(shcoolType);
+        hanHaiMember.setWorkValue(workValue);
+        hanHaiMember.setDetails(details);
+    	hanHaiMemberService.updateById(hanHaiMember);
     	return Result.ok("修改成功");
     }
 
@@ -43,5 +73,35 @@ public class AppletMyInfoController {
     }
 
 
+    //获取国籍带分页
+    @GetMapping(value = "/getNationalityPageList")
+    @ApiOperation(value="获取国籍带分页", notes="获取国籍带分页")
+    public Result<?> getNationalityPageList(String title, PageBean pageBean){
+        return apiIndexService.getNationalityPageList(title,pageBean);
+    }
+
+    //获取城市
+    @GetMapping(value = "/getCityPageList")
+    @ApiOperation(value="获取城市", notes="获取城市")
+    public Result<?> getCityPageList(String title, PageBean pageBean){
+        return apiIndexService.getCityPageList(title,pageBean);
+    }
+
+    //获取学院
+    @GetMapping(value = "/getSchoolPageList")
+    @ApiOperation(value="获取学院", notes="获取学院")
+    public Result<?> getSchoolPageList(String title, PageBean pageBean){
+        return apiIndexService.getSchoolPageList(title,pageBean);
+    }
+
+
+    //获取标签
+    @GetMapping(value = "/getLabelPageList")
+    @ApiOperation(value="获取标签", notes="获取标签")
+    public Result<?> getLabelPageList(String title, PageBean pageBean){
+    	return apiIndexService.getLabelPageList(title,pageBean);
+    }
+
+
 
 }

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

@@ -18,13 +18,13 @@ public interface ApiIndexService {
     Result<?> getYueDong();
 
     //获取首页活动列表带分页
-    Result<?> getActivityPageList(String title, PageBean pageBean);
+    Result<?> getActivityPageList(String title,String state, PageBean pageBean);
 
     //获取活动详情
     Result<?> getActivityInfo(String activityId);
 
     //获取旅行列表带分页
-    Result<?> getTravelPageList(String title, PageBean pageBean);
+    Result<?> getTravelPageList(String title, String state,PageBean pageBean);
 
     //旅行详情
     Result<?> getTravelInfo(String travelId);
@@ -34,11 +34,11 @@ public interface ApiIndexService {
     Result<?> getCollectPageList(String token, PageBean pageBean);
 
 
-
+    Result<?> getTwoPageList(String token,Integer type, PageBean pageBean);
 
 
     //获取订单列表数据带分页
-    Result<?> getOrderPageList(String token,PageBean pageBean);
+    Result<?> getOrderPageList(String token,String state,PageBean pageBean);
 
     //根据订单标识查询订单信息
     Result<?> getOrderInfo(String token,String orderId);
@@ -52,6 +52,10 @@ public interface ApiIndexService {
     //订单活动评价
     Result<?> evaluate(String token, String orderId,String  num, String evaluate);
 
+
+    //我的发票列表带分页
+    Result<?> getInvoicePageList(String token, PageBean pageBean);
+
     //订单开具发票
     Result<?> invoice(String token, PopularizeInvoicing popularizeInvoicing);
 
@@ -61,14 +65,24 @@ public interface ApiIndexService {
 
 
 
+
+
+
     //获取招募列表数据带分页
     Result<?> getRecruitPageList(String title, PageBean pageBean);
 
-    //点击参与招募
+
+    //获取招募详情
+    Result<?> getRecruitInfo(String recruitId);
+
+    //主理人认证
     Result<?> joinRecruit(String token, PopularizeAuthentication authentication);
 
 
-    Result<?> getActivityMemberPageList( String token, String title, PageBean pageBean);
+    //获取主理人认证信息
+    Result<?> getJoinRecruitInfo(String token);
+
+    Result<?> getActivityMemberPageList( String token, String title,Integer type, PageBean pageBean);
 
 
     //主理人主理的活动签到里面的签到用户列表带分页
@@ -86,10 +100,25 @@ public interface ApiIndexService {
 
 
 
+    //创建订单
+    Result<?> createOrder(String token, String id,Integer typePrice,Integer type);
+
+    //商城-支付回调
+    Object payNotify(String requestBody);
+
+
 
 
+    //获取国籍
+    Result<?> getNationalityPageList(String title, PageBean pageBean);
+    //获取城市
+    Result<?> getCityPageList(String title, PageBean pageBean);
+    //获取学院
+    Result<?> getSchoolPageList(String title, PageBean pageBean);
 
 
+    //获取标签
+    Result<?> getLabelPageList(String title, PageBean pageBean);
 
 
 }

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

@@ -1,6 +1,9 @@
 package org.jeecg.api.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.api.bean.PageBean;
@@ -14,6 +17,7 @@ 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;
 import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
 import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService;
 import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication;
@@ -22,6 +26,7 @@ import org.jeecg.modules.popularizeCity.entity.PopularizeCity;
 import org.jeecg.modules.popularizeCity.service.IPopularizeCityService;
 import org.jeecg.modules.popularizeCollect.entity.PopularizeCollect;
 import org.jeecg.modules.popularizeCollect.service.IPopularizeCollectService;
+import org.jeecg.modules.popularizeCountry.entity.PopularizeCountry;
 import org.jeecg.modules.popularizeCountry.service.IPopularizeCountryService;
 import org.jeecg.modules.popularizeEvaluate.entity.PopularizeEvaluate;
 import org.jeecg.modules.popularizeEvaluate.service.IPopularizeEvaluateService;
@@ -31,7 +36,12 @@ import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
 import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
 import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
 import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
+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.service.IPopularizeSignLogService;
 import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
 import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService;
@@ -40,8 +50,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
 
 
 @Slf4j
@@ -67,13 +77,21 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     @Autowired
     private IPopularizeCityService popularizeCityService;
     @Autowired
+    private IPopularizeSchoolSubService popularizeSchoolSubService;
+    @Autowired
     private IPopularizeSignLogService popularizeSignLogService;
     @Autowired
     private IPopularizeAuthenticationService popularizeAuthenticationService;
     @Autowired
     private IPopularizeActivityService popularizeActivityService;
+    @Autowired
+    private IPopularizeRecruitLogService popularizeRecruitLogService;
 
 
+    //支付接口
+    @Autowired
+    private MpWxPayService mpWxPayService;
+
     @Autowired
     private IHanHaiMemberService hanHaiMemberService;
     @Autowired
@@ -85,6 +103,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     private ShiroRealm shiroRealm;
 
 
+
     //获取首页地区
     @Override
     public Result<?> getArea(){
@@ -108,10 +127,11 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     //获取首页活动列表带分页
     @Override
-    public Result<?> getActivityPageList(String title,  PageBean pageBean){
+    public Result<?> getActivityPageList(String title, String state, PageBean pageBean){
         Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeActivity> page1 = popularizeActivityService
                 .lambdaQuery()
+                .eq(PopularizeActivity::getState,state)
                 .orderByDesc(PopularizeActivity::getCreateTime)
                 .page(page);
         //如果标题不为空
@@ -119,9 +139,29 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             page1 = popularizeActivityService
                     .lambdaQuery()
                     .like(PopularizeActivity::getTitle,title)
+                    .eq(PopularizeActivity::getState,state)
                     .orderByDesc(PopularizeActivity::getCreateTime)
                     .page(page);
         }
+        //得到集合
+        List<PopularizeActivity> records = page1.getRecords();
+        //创建一个新的集合
+        List<PopularizeActivity> recruitList = new ArrayList<>();
+        for (PopularizeActivity recruit : records) {
+            //创建一个对象
+            PopularizeActivity recruitObj = recruit;
+            recruitObj.setPopularizeOrderList(
+                    popularizeOrderService
+                            .lambdaQuery()
+                            .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
+                            .ge(PopularizeOrder::getState, 1)
+                            .list()
+            );
+            recruitObj.setNum(recruitObj.getPopularizeOrderList().size());
+            recruitList.add(recruitObj);
+        }
+
+        page1.setRecords(recruitList);
         return Result.OK(page1);
     }
 
@@ -129,14 +169,26 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     @Override
     public Result<?> getActivityInfo(String activityId){
+        Map<String,Object> map = new HashMap<>();
         PopularizeActivity byId = popularizeActivityService.getById(activityId);
-        return Result.OK(byId);
+        map.put("activityInfo",byId);
+        //根据活动中主理人用户标识查询用户信息
+        HanHaiMember byId1 = hanHaiMemberService.getById(byId.getAdminUser());
+        map.put("adminUserInfo",byId1);
+        //根据用户标识查询主理人信息
+        PopularizeAuthentication one = popularizeAuthenticationService
+                .lambdaQuery()
+                .eq(PopularizeAuthentication::getUserId, byId1.getId())
+                .eq(PopularizeAuthentication::getState, "1")
+                .one();
+        map.put("adminUser",one);
+        return Result.OK(map);
     }
 
 
     //获取旅行列表带分页
     @Override
-    public Result<?> getTravelPageList(String title, PageBean pageBean){
+    public Result<?> getTravelPageList(String title,String state, PageBean pageBean){
         Page<PopularizeTravel> page = new Page<PopularizeTravel>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeTravel> page1 = popularizeTravelService
                 .lambdaQuery()
@@ -147,9 +199,31 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             page1 = popularizeTravelService
                     .lambdaQuery()
                     .like(PopularizeTravel::getTitle,title)
+                    .eq(PopularizeTravel::getState,state)
                     .orderByDesc(PopularizeTravel::getCreateTime)
                     .page(page);
         }
+
+        //得到集合
+        List<PopularizeTravel> records = page1.getRecords();
+        //创建一个新的集合
+        List<PopularizeTravel> recruitList = new ArrayList<>();
+        for (PopularizeTravel recruit : records) {
+            //创建一个对象
+            PopularizeTravel recruitObj = recruit;
+            recruitObj.setOrderList(
+                    popularizeOrderService
+                            .lambdaQuery()
+                            .eq(PopularizeOrder::getTravelOrderId, recruit.getId())
+                            .ge(PopularizeOrder::getState, 1)
+                            .list()
+            );
+            recruitObj.setNum(recruitObj.getOrderList().size());
+            recruitList.add(recruitObj);
+        }
+
+        page1.setRecords(recruitList);
+
         return Result.OK(page1);
     }
 
@@ -157,8 +231,23 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     @Override
     public Result<?> getTravelInfo(String travelId){
+
+
+        Map<String,Object> map = new HashMap<>();
         PopularizeTravel byId = popularizeTravelService.getById(travelId);
-        return Result.OK(byId);
+        map.put("travel",byId);
+        //根据活动中主理人用户标识查询用户信息
+        HanHaiMember byId1 = hanHaiMemberService.getById(byId.getAdminUser());
+        map.put("adminUserInfo",byId1);
+        //根据用户标识查询主理人信息
+        PopularizeAuthentication one = popularizeAuthenticationService
+                .lambdaQuery()
+                .eq(PopularizeAuthentication::getUserId, byId1.getId())
+                .eq(PopularizeAuthentication::getState, "1")
+                .one();
+        map.put("adminUser",one);
+
+        return Result.OK(map);
     }
 
 
@@ -177,18 +266,37 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
 
 
+    @Override
+    public Result<?> getTwoPageList(String token,Integer type, PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        if(type == 1){
+            return this.getTravelPageList(null,"1",pageBean);
+        }else{
+            return this.getActivityPageList(null,"1",pageBean);
+        }
+    }
+
 
 
 
     //获取订单列表数据带分页
     @Override
-    public Result<?> getOrderPageList(String token, PageBean pageBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+    public Result<?> getOrderPageList(String token,String state, PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeOrder> page1 = popularizeOrderService
                 .lambdaQuery()
                 .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
-//                .orderByDesc(PopularizeOrder::getCreateTime)
+                .orderByDesc(PopularizeOrder::getCreateTime)
                 .page(page);
+        if(StringUtils.isNotBlank(state)){
+            page1 = popularizeOrderService
+                    .lambdaQuery()
+                    .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
+                    .eq(PopularizeOrder::getState,state)
+                    .orderByDesc(PopularizeOrder::getCreateTime)
+                    .page(page);
+        }
         return Result.OK(page1);
     }
 
@@ -206,7 +314,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     public Result<?> cancelOrder(String token,String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         PopularizeOrder byId = popularizeOrderService.getById(orderId);
-        byId.setState("2");
+        byId.setState("3");
         popularizeOrderService.updateById(byId);
         return Result.OK("取消成功");
     }
@@ -216,7 +324,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     public Result<?> signIn(String token,String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         PopularizeOrder byId = popularizeOrderService.getById(orderId);
-        byId.setState("3");
+        byId.setState("2");
         popularizeOrderService.updateById(byId);
         return Result.OK("签到成功");
     }
@@ -241,18 +349,76 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         }
         evaluateObj.setDetails(evaluate);
         boolean save = popularizeEvaluateService.save(evaluateObj);
+
+        //修改订单评价状态
+        byId.setIsFp("Y");
+        popularizeOrderService.updateById(byId);
         return Result.OK("评价成功");
     }
 
+
+    //我的发票列表带分页
+    @Override
+    public Result<?> getInvoicePageList(String token, PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<PopularizeInvoicing> page = new Page<PopularizeInvoicing>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeInvoicing> page1 = popularizeInvoicingService
+                .lambdaQuery()
+                .eq(PopularizeInvoicing::getUserId,hanHaiMember.getId())
+                .orderByDesc(PopularizeInvoicing::getCreateTime)
+                .page(page);
+
+        //得到集合
+        List<PopularizeInvoicing> records = page1.getRecords();
+        //创建一个新的集合
+        List<PopularizeInvoicing> recruitList = new ArrayList<>();
+        for (PopularizeInvoicing recruit : records) {
+            //创建一个对象
+            PopularizeInvoicing recruitObj = recruit;
+            if (recruit.getNoType().equals("0")){
+                recruitObj.setActivityList(
+                        popularizeActivityService
+                                .lambdaQuery()
+                                .eq(PopularizeActivity::getId, recruit.getActivityId())
+                                .list()
+                );
+            }else{
+                recruitObj.setTravelList(
+                        popularizeTravelService
+                                .lambdaQuery()
+                                .eq(PopularizeTravel::getId, recruit.getTravelId())
+                                .list()
+                );
+            }
+            recruitList.add(recruitObj);
+        }
+
+        page1.setRecords(recruitList);
+        return Result.OK(page1);
+    }
+
     //订单开具发票
     @Override
     public Result<?> invoice( String token, PopularizeInvoicing popularizeInvoicing){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         PopularizeOrder byId = popularizeOrderService.getById(popularizeInvoicing.getOrderId());
-
         //创建发票信息
         popularizeInvoicing.setUserId(hanHaiMember.getId());
         popularizeInvoicing.setCreateTime(new Date());
+        popularizeInvoicing.setNoType(byId.getType());
+        if(byId.getType().equals("0")){
+            popularizeInvoicing.setActivityId(byId.getActivityOrderId());
+        }else{
+            popularizeInvoicing.setTravelId(byId.getTravelOrderId());
+        }
+        popularizeInvoicing.setState("0");
+        //名称必填
+        if(StringUtils.isBlank(popularizeInvoicing.getName())){
+            return Result.error("请填写发票抬头");
+        }
+        if(StringUtils.isBlank(popularizeInvoicing.getEmil())){
+            return Result.error("请填写邮箱地址");
+        }
         popularizeInvoicingService.save(popularizeInvoicing);
 
         return Result.OK("开票成功");
@@ -264,13 +430,25 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     public Result<?> collect(String token,String activityId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         PopularizeCollect byId = popularizeCollectService.getById(activityId);
-        byId.setUserId(hanHaiMember.getId());
-        byId.setCreateTime(new Date());
-        popularizeCollectService.save(byId);
-        return Result.OK("收藏成功");
+        //如果不为空则删除数据取消收藏
+        if(byId != null){
+            popularizeCollectService.removeById(byId.getId());
+            return Result.OK("取消收藏成功");
+        }else{
+            byId = new PopularizeCollect();
+            byId.setUserId(hanHaiMember.getId());
+            byId.setActivityId(activityId);
+            byId.setCreateTime(new Date());
+            popularizeCollectService.save(byId);
+            return Result.OK("收藏成功");
+        }
     }
 
 
+
+
+
+
     //获取招募列表数据带分页
     @Override
     public Result<?> getRecruitPageList(String title, PageBean pageBean){
@@ -287,22 +465,92 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .orderByDesc(PopularizeRecruit::getCreateTime)
                     .page(page);
         }
+        //得到集合
+        List<PopularizeRecruit> records = page1.getRecords();
+        //创建一个新的集合
+        List<PopularizeRecruit> recruitList = new ArrayList<>();
+        for (PopularizeRecruit recruit : records) {
+            //创建一个对象
+            PopularizeRecruit recruitObj = recruit;
+            recruitObj.setPopularizeRecruitLogList(
+                    popularizeRecruitLogService.lambdaQuery()
+                            .eq(PopularizeRecruitLog::getRecruitId,recruit.getId())
+                            .list()
+            );
+            recruitObj.setNum(recruitObj.getPopularizeRecruitLogList().size());
+            recruitList.add(recruitObj);
+        }
+
+        page1.setRecords(recruitList);
+
         return Result.OK(page1);
     }
 
-    //点击参与招募
+
+
+    //获取招募详情
+    @Override
+    public Result<?> getRecruitInfo(String recruitId){
+        PopularizeRecruit byId = popularizeRecruitService.getById(recruitId);
+        return Result.OK(byId);
+    }
+
+    //主理人认证
     @Override
     public Result<?> joinRecruit(String token, PopularizeAuthentication authentication){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        authentication.setUserId(hanHaiMember.getId());
-        boolean save = popularizeAuthenticationService.save(authentication);
+        //查询该用户是否已经提交
+        PopularizeAuthentication one = popularizeAuthenticationService.lambdaQuery()
+                .eq(PopularizeAuthentication::getUserId, hanHaiMember.getId())
+                .one();
+        if(one!=null){
+            //审核成功
+            if(one.getState().equals("1")){
+                return Result.OK("您已经成为了主理人,请不要重复提交");
+            }else if(one.getState().equals("2")){
+                authentication.setId(one.getId());
+                authentication.setUserId(hanHaiMember.getId());
+                boolean save = popularizeAuthenticationService.updateById(authentication);
+                return Result.OK("参与成功");
+            }else{
+                authentication.setId(one.getId());
+                authentication.setUserId(hanHaiMember.getId());
+                boolean save = popularizeAuthenticationService.updateById(authentication);
+                return Result.OK("您已经提交了,请等待审核");
+            }
+
+        }else{
+            authentication.setUserId(hanHaiMember.getId());
+            boolean save = popularizeAuthenticationService.saveOrUpdate(authentication);
+        }
         return Result.OK("参与成功");
     }
 
 
+
+    //获取主理人认证信息
+    @Override
+    public Result<?> getJoinRecruitInfo(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //查询该用户是否已经提交
+        PopularizeAuthentication one = popularizeAuthenticationService.lambdaQuery()
+                .eq(PopularizeAuthentication::getUserId, hanHaiMember.getId())
+                .one();
+        return Result.OK(one);
+    }
+
+
+
+
     @Override
-    public Result<?> getActivityMemberPageList( String token, String title, PageBean pageBean){
-        return Result.OK();
+    public Result<?> getActivityMemberPageList( String token, String title, Integer type,PageBean pageBean){
+
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        if(type == 1){
+            return this.getTravelPageList(null,"1",pageBean);
+        }else{
+            return this.getActivityPageList(null,"1",pageBean);
+        }
     }
     //招募活动签到里面的签到用户列表带分页
     @Override
@@ -316,9 +564,44 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         return Result.OK();
     }
 
-    //主理人认证
+    //点击参与招募
     @Override
     public Result<?> shopUserAuth(String token,String recruitId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        if(StringUtils.isBlank(recruitId)){
+            return Result.error("招募标识不能为空");
+        }
+        //根据标识查询招募活动信息
+        PopularizeRecruit byId = popularizeRecruitService.getById(recruitId);
+        if(byId==null){
+            return Result.error("招募标识错误");
+        }
+        //根据用户标识查询主理人信息
+        PopularizeAuthentication one = popularizeAuthenticationService.lambdaQuery()
+                .eq(PopularizeAuthentication::getUserId, hanHaiMember.getId())
+                .eq(PopularizeAuthentication::getState, "1")
+                .one();
+        if(one==null){
+            return Result.error("您还不是主理人,请先认证");
+        }
+        //查询是否已经点击了招募
+        PopularizeRecruitLog one1 = popularizeRecruitLogService.lambdaQuery()
+                .eq(PopularizeRecruitLog::getUserId, hanHaiMember.getId())
+                .eq(PopularizeRecruitLog::getRecruitId, recruitId)
+                .one();
+        if(one1!=null){
+            return Result.error("您已经参与过该招募活动");
+        }
+        //增加招募记录
+        PopularizeRecruitLog popularizeRecruitLog = new PopularizeRecruitLog();
+        popularizeRecruitLog.setUserId(hanHaiMember.getId());
+        popularizeRecruitLog.setRecruitId(recruitId);
+        popularizeRecruitLog.setCreateTime(new Date());
+        popularizeRecruitLog.setRecruitTime(byId.getStartTime());
+        popularizeRecruitLog.setName(one.getName());
+        popularizeRecruitLog.setPhone(one.getPhone());
+        popularizeRecruitLog.setHeadImage(hanHaiMember.getHeadImage());
+        popularizeRecruitLogService.save(popularizeRecruitLog);
         return Result.OK();
     }
 
@@ -327,9 +610,258 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
 
 
+    //创建订单
+    @Override
+    public Result<?> createOrder(String token, String id,Integer typePrice,Integer type){
+        if(type == 1){
+            return this.createOrderTravel(token, id);
+        }else{
+            return this.createOrderActivity(token, id, typePrice);
+        }
+
+    }
+
+
+    public Result<?> createOrderTravel(String token, String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //判断活动标识不能为空
+        if(StringUtils.isBlank(id)){
+            return Result.error("旅行标识不能为空");
+        }
+        //根据标识查活动信息
+        PopularizeTravel byId = popularizeTravelService.getById(id);
+        if(byId==null){
+            return Result.error("旅行不存在");
+        }
+        //判断活动是否已结束
+        if(byId.getState().equals("1")){
+            return Result.error("旅行已结束");
+        }
+        //活动超时
+        if(byId.getStartTime().getTime()<new Date().getTime()){
+            return Result.error("旅行已结束,当前时间无法报名");
+        }
+        //查询是否已报名该活动
+        PopularizeOrder order = popularizeOrderService
+                .lambdaQuery()
+                .eq(PopularizeOrder::getTravelOrderId, id)
+                .eq(PopularizeOrder::getUserId, hanHaiMember.getId())
+                .one();
+        if(order!=null){
+            return Result.error("已报名该旅行,请不要重复报名！");
+        }
+        //查询报名该活动的已支付成功的订单数是否大于报名人数
+        long count = popularizeOrderService
+                .lambdaQuery()
+                .eq(PopularizeOrder::getTravelOrderId, id)
+                .eq(PopularizeOrder::getState, "1")
+                .count();
+        if(count>=byId.getNum()){
+            return Result.error("报名人数已满,请不要重复报名！");
+        }
 
+        //创建订单
+        BigDecimal payPrice = byId.getPrice();
+        String orderId =System.currentTimeMillis()+"";
+        PopularizeOrder popularizeOrder = new PopularizeOrder();
+        popularizeOrder.setId(orderId);
+        popularizeOrder.setActivityOrderId(id);
+        popularizeOrder.setUserId(hanHaiMember.getId());
+        popularizeOrder.setType("0"); //0活动1旅行
+        popularizeOrder.setTitle(byId.getTitle());
+        popularizeOrder.setImage(byId.getImage());
+        popularizeOrder.setStartTime(byId.getStartTime());
+        popularizeOrder.setAddress(byId.getAddress());
+        popularizeOrder.setPrice(byId.getPrice()); //活动价格
+        popularizeOrder.setNum(1);
+        popularizeOrder.setState("0");
+        popularizeOrder.setCreateTime(new Date());
+        popularizeOrder.setIsFp("N");
+        popularizeOrder.setIsPj("N");
+        popularizeOrder.setOpen("N");
+        popularizeOrderService.save(popularizeOrder);
+
+
+        //吊起微信支付
+        String s = payPrice.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+        Object appOrder = mpWxPayService.createOrder(
+                "购买"+popularizeOrder.getTitle(),
+                "127.0.0.1",
+                orderId,
+                i1,
+                orderId,
+                hanHaiMember.getAppletOpenid(),
+                popularizeOrder.toString());
+
+        return Result.OK("支付成功",appOrder);
 
+    }
 
 
+    public Result<?> createOrderActivity(String token, String id,Integer typePrice){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //判断活动标识不能为空
+        if(StringUtils.isBlank(id)){
+            return Result.error("活动标识不能为空");
+        }
+        //判断报名类型不能为空
+        if(typePrice==null){
+            return Result.error("报名价格类型不能为空");
+        }
+        //根据标识查活动信息
+        PopularizeActivity byId = popularizeActivityService.getById(id);
+        if(byId==null){
+            return Result.error("活动不存在");
+        }
+        //判断活动是否已结束
+        if(byId.getState()==1){
+            return Result.error("活动已结束");
+        }
+        //活动超时
+        if(byId.getStartTime().getTime()<new Date().getTime()){
+            return Result.error("活动已结束,当前时间无法报名");
+        }
+        //查询是否已报名该活动
+        PopularizeOrder order = popularizeOrderService
+                .lambdaQuery()
+                .eq(PopularizeOrder::getActivityOrderId, id)
+                .eq(PopularizeOrder::getUserId, hanHaiMember.getId())
+                .one();
+        if(order!=null){
+            return Result.error("已报名该活动,请不要重复报名！");
+        }
+        //查询报名该活动的已支付成功的订单数是否大于报名人数
+        long count = popularizeOrderService
+                .lambdaQuery()
+                .eq(PopularizeOrder::getActivityOrderId, id)
+                .eq(PopularizeOrder::getState, "1")
+                .count();
+        if(count>=byId.getSum()){
+            return Result.error("报名人数已满");
+        }
+
+        //创建订单
+        BigDecimal payPrice = new BigDecimal(0);
+        String orderId =System.currentTimeMillis()+"";
+        PopularizeOrder popularizeOrder = new PopularizeOrder();
+        popularizeOrder.setId(orderId);
+        popularizeOrder.setActivityOrderId(id);
+        popularizeOrder.setUserId(hanHaiMember.getId());
+        popularizeOrder.setType("0"); //0活动1旅行
+        popularizeOrder.setTitle(byId.getTitle());
+        popularizeOrder.setImage(byId.getImage());
+        popularizeOrder.setStartTime(byId.getStartTime());
+        popularizeOrder.setAddress(byId.getAddress());
+        popularizeOrder.setPrice(byId.getPrice()); //活动价格
+        //如果typePrice=0为早鸟价 1为单人价 2为尊享价
+        if(typePrice==0){
+            popularizeOrder.setPayPrice(byId.getBirdPrice());
+            payPrice = byId.getBirdPrice();
+        }else if(typePrice==1){
+            popularizeOrder.setPayPrice(byId.getPersonPrice());
+            payPrice = byId.getPersonPrice();
+        }else{
+            popularizeOrder.setPayPrice(byId.getExpensivePrice());
+            payPrice = byId.getExpensivePrice();
+        }
+        popularizeOrder.setNum(1);
+        popularizeOrder.setState("0");
+        popularizeOrder.setCreateTime(new Date());
+        popularizeOrder.setIsFp("N");
+        popularizeOrder.setIsPj("N");
+        popularizeOrder.setOpen("N");
+        popularizeOrder.setDetails(byId.getOrderDetails());
+        popularizeOrderService.save(popularizeOrder);
+
+
+        //吊起微信支付
+        String s = payPrice.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+        Object appOrder = mpWxPayService.createOrder(
+                "购买"+popularizeOrder.getTitle(),
+                "127.0.0.1",
+                orderId,
+                i1,
+                orderId,
+                hanHaiMember.getAppletOpenid(),
+                popularizeOrder.toString());
+
+        return Result.OK("支付成功",appOrder);
+
+    }
+
+    //商城-支付回调
+    @Override
+    public Object payNotify(String requestBody){
+        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+        String outTradeNo = notify.getOutTradeNo();
+        log.info("活动报名支付回调订单号码："+outTradeNo);
+        //查询活动订单
+        PopularizeOrder order = popularizeOrderService.getById(outTradeNo);
+        //如果订单存在
+        if(order!=null){
+            if(order.getState().equals("0")){
+                order.setState("1");
+                order.setPayTime(new Date());
+                popularizeOrderService.updateById(order);
+                //修改当前报名人数
+                PopularizeActivity byId = popularizeActivityService.getById(order.getActivityOrderId());
+                byId.setNum(byId.getNum()+1);
+                popularizeActivityService.updateById(byId);
+            }
+        }
+        return null;
+    }
+
+
+
+    //获取国籍
+    @Override
+    public Result<?> getNationalityPageList(String title, PageBean pageBean){
+        Page<PopularizeCountry> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
+        QueryWrapper<PopularizeCountry> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(title),"title",title);
+        queryWrapper.orderByDesc("create_time");
+        IPage<PopularizeCountry> pageList = popularizeCountryService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    //获取城市
+    @Override
+    public Result<?> getCityPageList(String title, PageBean pageBean){
+        Page<PopularizeCity> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
+        QueryWrapper<PopularizeCity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(title),"title",title);
+        queryWrapper.orderByDesc("create_time");
+        IPage<PopularizeCity> pageList = popularizeCityService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    //获取学院
+    @Override
+    public Result<?> getSchoolPageList(String title, PageBean pageBean){
+        Page<PopularizeSchool> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
+        QueryWrapper<PopularizeSchool> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(title),"title",title);
+        queryWrapper.orderByDesc("create_time");
+        IPage<PopularizeSchool> pageList = popularizeSchoolService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    //获取标签
+    @Override
+    public Result<?> getLabelPageList(String title, PageBean pageBean){
+        Page<PopularizeSchoolSub> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
+        QueryWrapper<PopularizeSchoolSub> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(title),"title",title);
+        queryWrapper.orderByDesc("create_time");
+        IPage<PopularizeSchoolSub> pageList = popularizeSchoolSubService.page(page, queryWrapper);
+        return Result.OK(pageList);
+
+    }
 
 }

module-common/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -1,244 +0,0 @@
-package org.jeecg.modules.hanHaiMember.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 用户账户表
- * @Author: jeecg-boot
- * @Date:   2024-12-19
- * @Version: V1.0
- */
-@Data
-@TableName("han_hai_member")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="han_hai_member对象", description="用户账户表")
-public class HanHaiMember implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**所属部门*/
-    @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
-	/**用户昵称*/
-	@Excel(name = "用户昵称", width = 15)
-    @ApiModelProperty(value = "用户昵称")
-    private java.lang.String nickName;
-	/**用户头像*/
-	@Excel(name = "用户头像", width = 15)
-    @ApiModelProperty(value = "用户头像")
-    private java.lang.String headImage;
-	/**真实姓名*/
-	@Excel(name = "真实姓名", width = 15)
-    @ApiModelProperty(value = "真实姓名")
-    private java.lang.String name;
-	/**手机号码*/
-	@Excel(name = "手机号码", width = 15)
-    @ApiModelProperty(value = "手机号码")
-    private java.lang.String phone;
-	/**登录账号*/
-	@Excel(name = "登录账号", width = 15)
-    @ApiModelProperty(value = "登录账号")
-    private java.lang.String account;
-	/**登录密码*/
-	@Excel(name = "登录密码", width = 15)
-    @ApiModelProperty(value = "登录密码")
-    private java.lang.String password;
-	/**登录盐*/
-	@Excel(name = "登录盐", width = 15)
-    @ApiModelProperty(value = "登录盐")
-    private java.lang.String passwordSalt;
-	/**店铺名称备注*/
-	@Excel(name = "店铺名称备注", width = 15)
-    @ApiModelProperty(value = "店铺名称备注")
-    private java.lang.String shopName;
-	/**角色*/
-	@Excel(name = "角色", width = 15, dicCode = "member_role")
-	@Dict(dicCode = "member_role")
-    @ApiModelProperty(value = "角色")
-    private java.lang.Integer role;
-	/**ID标识号码*/
-	@Excel(name = "ID标识号码", width = 15)
-    @ApiModelProperty(value = "ID标识号码")
-    private java.lang.String cardId;
-	/**是否冻结*/
-	@Excel(name = "是否冻结", width = 15)
-    @ApiModelProperty(value = "是否冻结")
-    private java.lang.String frozenFlag;
-	/**是否删除*/
-	@Excel(name = "是否删除", width = 15)
-    @ApiModelProperty(value = "是否删除")
-    private java.lang.String deleteFlag;
-	/**登录TOEKN*/
-	@Excel(name = "登录TOEKN", width = 15)
-    @ApiModelProperty(value = "登录TOEKN")
-    private java.lang.String token;
-	/**公众号openid*/
-	@Excel(name = "公众号openid", width = 15)
-    @ApiModelProperty(value = "公众号openid")
-    private java.lang.String officialOpenid;
-	/**小程序标识*/
-	@Excel(name = "小程序标识", width = 15)
-    @ApiModelProperty(value = "小程序标识")
-    private java.lang.String appletOpenid;
-	/**APP标识*/
-	@Excel(name = "APP标识", width = 15)
-    @ApiModelProperty(value = "APP标识")
-    private java.lang.String appOpenid;
-	/**微信UNIONID*/
-	@Excel(name = "微信UNIONID", width = 15)
-    @ApiModelProperty(value = "微信UNIONID")
-    private java.lang.String wxUnionid;
-	/**公众号appid*/
-	@Excel(name = "公众号appid", width = 15)
-    @ApiModelProperty(value = "公众号appid")
-    private java.lang.String officialAppid;
-	/**身份证号码*/
-	@Excel(name = "身份证号码", width = 15)
-    @ApiModelProperty(value = "身份证号码")
-    private java.lang.String idCard;
-	/**发薪平台密码*/
-	@Excel(name = "发薪平台密码", width = 15)
-    @ApiModelProperty(value = "发薪平台密码")
-    private java.lang.String idCardPassword;
-	/**发薪平台加密盐*/
-	@Excel(name = "发薪平台加密盐", width = 15)
-    @ApiModelProperty(value = "发薪平台加密盐")
-    private java.lang.String idCardSalt;
-	/**是否实名认证*/
-	@Excel(name = "是否实名认证", width = 15)
-    @ApiModelProperty(value = "是否实名认证")
-    private java.lang.Integer idCardOpen;
-	/**粉丝人数*/
-	@Excel(name = "粉丝人数", width = 15)
-    @ApiModelProperty(value = "粉丝人数")
-    private java.lang.Integer intentionNum;
-	/**successNum*/
-	@Excel(name = "successNum", width = 15)
-    @ApiModelProperty(value = "successNum")
-    private java.lang.Integer successNum;
-	/**addNum*/
-	@Excel(name = "addNum", width = 15)
-    @ApiModelProperty(value = "addNum")
-    private java.lang.Integer addNum;
-	/**邀请人*/
-	@Excel(name = "邀请人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-    @ApiModelProperty(value = "邀请人")
-    private java.lang.String shareId;
-	/**邀请人*/
-	@Excel(name = "邀请人", width = 15)
-    @ApiModelProperty(value = "邀请人")
-    private java.lang.String vid;
-	/**邀请时间*/
-	@Excel(name = "邀请时间", width = 15)
-    @ApiModelProperty(value = "邀请时间")
-    private java.util.Date vtime;
-	/**用户角色*/
-	@Excel(name = "用户角色", width = 15, dicCode = "member_role")
-	@Dict(dicCode = "member_role")
-    @ApiModelProperty(value = "用户角色")
-    private java.lang.Integer isPay;
-	/**是否关注公众号*/
-	@Excel(name = "是否关注公众号", width = 15)
-    @ApiModelProperty(value = "是否关注公众号")
-    private java.lang.Integer follow;
-	/**payRole*/
-	@Excel(name = "payRole", width = 15)
-    @ApiModelProperty(value = "payRole")
-    private java.math.BigDecimal payRole;
-	/**余额*/
-	@Excel(name = "余额", width = 15)
-    @ApiModelProperty(value = "余额")
-    private java.math.BigDecimal price;
-	/**积分*/
-	@Excel(name = "积分", width = 15)
-    @ApiModelProperty(value = "积分")
-    private java.math.BigDecimal integerPrice;
-	/**小程序appid*/
-	@Excel(name = "小程序appid", width = 15)
-    @ApiModelProperty(value = "小程序appid")
-    private java.lang.String appletAppid;
-	/**性别*/
-	@Excel(name = "性别", width = 15)
-    @ApiModelProperty(value = "性别")
-    private java.lang.String sex;
-	/**是否分销商*/
-	@Excel(name = "是否分销商", width = 15)
-    @ApiModelProperty(value = "是否分销商")
-    private java.lang.String isDai;
-	/**出生年*/
-	@Excel(name = "出生年", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "出生年")
-    private java.util.Date yearDate;
-	/**地址*/
-	@Excel(name = "地址", width = 15)
-    @ApiModelProperty(value = "地址")
-    private java.lang.String address;
-	/**可提现金额*/
-	@Excel(name = "可提现金额", width = 15)
-    @ApiModelProperty(value = "可提现金额")
-    private java.math.BigDecimal money;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private java.lang.String state;
-	/**国籍*/
-	@Excel(name = "国籍", width = 15)
-    @ApiModelProperty(value = "国籍")
-    private java.lang.String city;
-	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
-    @ApiModelProperty(value = "邮箱")
-    private java.lang.String email;
-	/**学历*/
-	@Excel(name = "学历", width = 15)
-    @ApiModelProperty(value = "学历")
-    private java.lang.String shcool;
-	/**院校类型*/
-	@Excel(name = "院校类型", width = 15)
-    @ApiModelProperty(value = "院校类型")
-    private java.lang.String shcoolType;
-	/**工作*/
-	@Excel(name = "工作", width = 15)
-    @ApiModelProperty(value = "工作")
-    private java.lang.String workValue;
-	/**关于我*/
-	@Excel(name = "关于我", width = 15)
-    @ApiModelProperty(value = "关于我")
-    private java.lang.String details;
-}

module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.hanHaiMember.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 用户账户表
- * @Author: jeecg-boot
- * @Date:   2024-12-19
- * @Version: V1.0
- */
-public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {
-
-}

module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.hanHaiMember.service;
-
-import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 用户账户表
- * @Author: jeecg-boot
- * @Date:   2024-12-19
- * @Version: V1.0
- */
-public interface IHanHaiMemberService extends IService<HanHaiMember> {
-
-}

module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.hanHaiMember.service.impl;
-
-import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import org.jeecg.modules.hanHaiMember.mapper.HanHaiMemberMapper;
-import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 用户账户表
- * @Author: jeecg-boot
- * @Date:   2024-12-19
- * @Version: V1.0
- */
-@Service
-public class HanHaiMemberServiceImpl extends ServiceImpl<HanHaiMemberMapper, HanHaiMember> implements IHanHaiMemberService {
-
-}

module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -1,169 +0,0 @@
-<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="nickName">
-              <a-input v-model="model.nickName" placeholder="请输入用户昵称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="用户头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headImage">
-              <j-image-upload isMultiple  v-model="model.headImage" ></j-image-upload>
-            </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="appletOpenid">
-              <a-input v-model="model.appletOpenid" placeholder="请输入小程序标识"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
-              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="出生年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearDate">
-              <j-date placeholder="请选择出生年" v-model="model.yearDate"  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="state">
-              <a-input v-model="model.state" placeholder="请输入状态"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="国籍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="city">
-              <a-input v-model="model.city" placeholder="请输入国籍"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
-              <a-input v-model="model.email" placeholder="请输入邮箱"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shcool">
-              <a-input v-model="model.shcool" placeholder="请输入学历"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="院校类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shcoolType">
-              <a-input v-model="model.shcoolType" placeholder="请输入院校类型"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="工作" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workValue">
-              <a-input v-model="model.workValue" placeholder="请输入工作"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="关于我" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
-              <a-textarea v-model="model.details" rows="4" 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: 'HanHaiMemberForm',
-    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: "/hanHaiMember/hanHaiMember/add",
-          edit: "/hanHaiMember/hanHaiMember/edit",
-          queryById: "/hanHaiMember/hanHaiMember/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/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -1,170 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '创建日期',
-    align:"center",
-    dataIndex: 'createTime'
-   },
-   {
-    title: '用户昵称',
-    align:"center",
-    dataIndex: 'nickName'
-   },
-   {
-    title: '用户头像',
-    align:"center",
-    dataIndex: 'headImage',
-    customRender:render.renderAvatar,
-   },
-   {
-    title: '手机号码',
-    align:"center",
-    dataIndex: 'phone'
-   },
-   {
-    title: '小程序标识',
-    align:"center",
-    dataIndex: 'appletOpenid'
-   },
-   {
-    title: '性别',
-    align:"center",
-    dataIndex: 'sex'
-   },
-   {
-    title: '出生年',
-    align:"center",
-    dataIndex: 'yearDate',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text)
-    },
-   },
-   {
-    title: '地址',
-    align:"center",
-    dataIndex: 'address'
-   },
-   {
-    title: '状态',
-    align:"center",
-    dataIndex: 'state'
-   },
-   {
-    title: '国籍',
-    align:"center",
-    dataIndex: 'city'
-   },
-   {
-    title: '邮箱',
-    align:"center",
-    dataIndex: 'email'
-   },
-   {
-    title: '学历',
-    align:"center",
-    dataIndex: 'shcool'
-   },
-   {
-    title: '院校类型',
-    align:"center",
-    dataIndex: 'shcoolType'
-   },
-   {
-    title: '工作',
-    align:"center",
-    dataIndex: 'workValue'
-   },
-   {
-    title: '关于我',
-    align:"center",
-    dataIndex: 'details'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-	{
-      label: "用户昵称",
-      field: "nickName",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '用户昵称',
-    field: 'nickName',
-    component: 'Input',
-  },
-  {
-    label: '用户头像',
-    field: 'headImage',
-     component: 'JImageUpload',
-     componentProps:{
-      },
-  },
-  {
-    label: '手机号码',
-    field: 'phone',
-    component: 'Input',
-  },
-  {
-    label: '小程序标识',
-    field: 'appletOpenid',
-    component: 'Input',
-  },
-  {
-    label: '性别',
-    field: 'sex',
-    component: 'Input',
-  },
-  {
-    label: '出生年',
-    field: 'yearDate',
-    component: 'DatePicker',
-  },
-  {
-    label: '地址',
-    field: 'address',
-    component: 'Input',
-  },
-  {
-    label: '状态',
-    field: 'state',
-    component: 'Input',
-  },
-  {
-    label: '国籍',
-    field: 'city',
-    component: 'Input',
-  },
-  {
-    label: '邮箱',
-    field: 'email',
-    component: 'Input',
-  },
-  {
-    label: '学历',
-    field: 'shcool',
-    component: 'Input',
-  },
-  {
-    label: '院校类型',
-    field: 'shcoolType',
-    component: 'Input',
-  },
-  {
-    label: '工作',
-    field: 'workValue',
-    component: 'Input',
-  },
-  {
-    label: '关于我',
-    field: 'details',
-    component: 'InputTextArea',//TODO 注意string转换问题
-  },
-];

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

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

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

@@ -4,11 +4,15 @@ 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;
+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;
@@ -20,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 活动信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Data
@@ -146,4 +150,12 @@ public class PopularizeActivity implements Serializable {
 	@Excel(name = "纬度", width = 15)
     @ApiModelProperty(value = "纬度")
     private java.lang.String latitude;
+	/**活动需知*/
+	@Excel(name = "活动需知", width = 15)
+    @ApiModelProperty(value = "活动需知")
+    private java.lang.String orderDetails;
+
+
+    @TableField(exist = false)
+    private List<PopularizeOrder> popularizeOrderList;
 }

module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/PopularizeActivityMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 活动信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface PopularizeActivityMapper extends BaseMapper<PopularizeActivity> {

module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/IPopularizeActivityService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 活动信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface IPopularizeActivityService extends IService<PopularizeActivity> {

module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/impl/PopularizeActivityServiceImpl.java

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

module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/PopularizeActivityList.vue

@@ -287,6 +287,11 @@
             align:"center",
             dataIndex: 'latitude'
           },
+          {
+            title:'活动需知',
+            align:"center",
+            dataIndex: 'orderDetails'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -347,6 +352,7 @@
         fieldList.push({type:'BigDecimal',value:'expensivePrice',text:'尊享票',dictCode:''})
         fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'Text',value:'orderDetails',text:'活动需知',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityForm.vue

@@ -118,6 +118,11 @@
               <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="活动需知" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderDetails">
+              <a-textarea v-model="model.orderDetails" rows="4" placeholder="请输入活动需知" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.data.ts

@@ -114,6 +114,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'latitude'
    },
+   {
+    title: '活动需知',
+    align:"center",
+    dataIndex: 'orderDetails'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -316,4 +321,9 @@ export const formSchema: FormSchema[] = [
     field: 'latitude',
     component: 'Input',
   },
+  {
+    label: '活动需知',
+    field: 'orderDetails',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
 ];

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

@@ -4,11 +4,17 @@ 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;
+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;
@@ -92,4 +98,13 @@ public class PopularizeInvoicing implements Serializable {
 	@Excel(name = "订单", width = 15)
     @ApiModelProperty(value = "订单")
     private java.lang.String orderId;
+
+
+    //旅行信息
+    @TableField(exist = false)
+    private List<PopularizeTravel> travelList;
+
+    //活动信息
+    @TableField(exist = false)
+    private List<PopularizeActivity> activityList;
 }

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

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Api(tags="订单列表")

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

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Data
@@ -51,7 +51,7 @@ public class PopularizeOrder implements Serializable {
 	@Excel(name = "订单状态", width = 15, dicCode = "order_state")
 	@Dict(dicCode = "order_state")
     @ApiModelProperty(value = "订单状态")
-    private java.lang.String state;
+    private java.lang.String  state;
 	/**订单标题*/
 	@Excel(name = "订单标题", width = 15)
     @ApiModelProperty(value = "订单标题")
@@ -76,7 +76,7 @@ public class PopularizeOrder implements Serializable {
 	/**价格*/
 	@Excel(name = "价格", width = 15)
     @ApiModelProperty(value = "价格")
-    private java.lang.String price;
+    private java.math.BigDecimal price;
 	/**需知*/
 	@Excel(name = "需知", width = 15)
     @ApiModelProperty(value = "需知")

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface PopularizeOrderMapper extends BaseMapper<PopularizeOrder> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface IPopularizeOrderService extends IService<PopularizeOrder> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Service

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

@@ -283,7 +283,7 @@
         fieldList.push({type:'string',value:'type',text:'类型',dictCode:'order_type'})
         fieldList.push({type:'datetime',value:'startTime',text:'时间'})
         fieldList.push({type:'string',value:'address',text:'地点',dictCode:''})
-        fieldList.push({type:'string',value:'price',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'})

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

@@ -35,7 +35,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input v-model="model.price" placeholder="请输入价格"  ></a-input>
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

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

@@ -174,7 +174,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '价格',
     field: 'price',
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '是否签到',

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

@@ -4,11 +4,15 @@ 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;
+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.popularizeRecruitLog.entity.PopularizeRecruitLog;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -92,4 +96,8 @@ public class PopularizeRecruit implements Serializable {
 	@Excel(name = "参与人数", width = 15)
     @ApiModelProperty(value = "参与人数")
     private java.lang.Integer num;
+
+
+    @TableField(exist = false)
+    private List<PopularizeRecruitLog> popularizeRecruitLogList;
 }

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.popularizeRecruitLog.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.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+@Api(tags="招募报名日志")
+@RestController
+@RequestMapping("/popularizeRecruitLog/popularizeRecruitLog")
+@Slf4j
+public class PopularizeRecruitLogController extends JeecgController<PopularizeRecruitLog, IPopularizeRecruitLogService> {
+	@Autowired
+	private IPopularizeRecruitLogService popularizeRecruitLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param popularizeRecruitLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "招募报名日志-分页列表查询")
+	@ApiOperation(value="招募报名日志-分页列表查询", notes="招募报名日志-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PopularizeRecruitLog>> queryPageList(PopularizeRecruitLog popularizeRecruitLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PopularizeRecruitLog> queryWrapper = QueryGenerator.initQueryWrapper(popularizeRecruitLog, req.getParameterMap());
+		Page<PopularizeRecruitLog> page = new Page<PopularizeRecruitLog>(pageNo, pageSize);
+		IPage<PopularizeRecruitLog> pageList = popularizeRecruitLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param popularizeRecruitLog
+	 * @return
+	 */
+	@AutoLog(value = "招募报名日志-添加")
+	@ApiOperation(value="招募报名日志-添加", notes="招募报名日志-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
+		popularizeRecruitLogService.save(popularizeRecruitLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param popularizeRecruitLog
+	 * @return
+	 */
+	@AutoLog(value = "招募报名日志-编辑")
+	@ApiOperation(value="招募报名日志-编辑", notes="招募报名日志-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
+		popularizeRecruitLogService.updateById(popularizeRecruitLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "招募报名日志-通过id删除")
+	@ApiOperation(value="招募报名日志-通过id删除", notes="招募报名日志-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		popularizeRecruitLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "招募报名日志-批量删除")
+	@ApiOperation(value="招募报名日志-批量删除", notes="招募报名日志-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.popularizeRecruitLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "招募报名日志-通过id查询")
+	@ApiOperation(value="招募报名日志-通过id查询", notes="招募报名日志-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PopularizeRecruitLog> queryById(@RequestParam(name="id",required=true) String id) {
+		PopularizeRecruitLog popularizeRecruitLog = popularizeRecruitLogService.getById(id);
+		if(popularizeRecruitLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(popularizeRecruitLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param popularizeRecruitLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PopularizeRecruitLog popularizeRecruitLog) {
+        return super.exportXls(request, popularizeRecruitLog, PopularizeRecruitLog.class, "招募报名日志");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PopularizeRecruitLog.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.popularizeRecruitLog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("popularize_recruit_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="popularize_recruit_log对象", description="招募报名日志")
+public class PopularizeRecruitLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**用户信息*/
+	@Excel(name = "用户信息", width = 15)
+    @ApiModelProperty(value = "用户信息")
+    private java.lang.String userId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String name;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+	/**头像*/
+	@Excel(name = "头像", width = 15)
+    @ApiModelProperty(value = "头像")
+    private java.lang.String headImage;
+	/**招募项目*/
+	@Excel(name = "招募项目", width = 15)
+    @ApiModelProperty(value = "招募项目")
+    private java.lang.String recruitId;
+	/**项目时间*/
+	@Excel(name = "项目时间", width = 15)
+    @ApiModelProperty(value = "项目时间")
+    private java.util.Date recruitTime;
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.popularizeRecruitLog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+public interface PopularizeRecruitLogMapper extends BaseMapper<PopularizeRecruitLog> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.popularizeRecruitLog.mapper.PopularizeRecruitLogMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.popularizeRecruitLog.service;
+
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+public interface IPopularizeRecruitLogService extends IService<PopularizeRecruitLog> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.popularizeRecruitLog.service.impl;
+
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import org.jeecg.modules.popularizeRecruitLog.mapper.PopularizeRecruitLogMapper;
+import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+@Service
+public class PopularizeRecruitLogServiceImpl extends ServiceImpl<PopularizeRecruitLogMapper, PopularizeRecruitLog> implements IPopularizeRecruitLogService {
+
+}

module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue → module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue

@@ -4,21 +4,6 @@
     <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.nickName"></a-input>
-            </a-form-item>
-          </a-col>
-          <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>
@@ -27,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <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-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>
@@ -104,7 +89,7 @@
       </a-table>
     </div>
 
-    <han-hai-member-modal ref="modalForm" @ok="modalFormOk"></han-hai-member-modal>
+    <popularize-recruit-log-modal ref="modalForm" @ok="modalFormOk"></popularize-recruit-log-modal>
   </a-card>
 </template>
 
@@ -113,17 +98,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import HanHaiMemberModal from './modules/HanHaiMemberModal'
+  import PopularizeRecruitLogModal from './modules/PopularizeRecruitLogModal'
 
   export default {
-    name: 'HanHaiMemberList',
+    name: 'PopularizeRecruitLogList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      HanHaiMemberModal
+      PopularizeRecruitLogModal
     },
     data () {
       return {
-        description: '用户账户表管理页面',
+        description: '招募报名日志管理页面',
         // 表头
         columns: [
           {
@@ -137,83 +122,34 @@
             }
           },
           {
-            title:'创建日期',
+            title:'用户信息',
             align:"center",
-            dataIndex: 'createTime'
+            dataIndex: 'userId'
           },
           {
-            title:'用户昵称',
+            title:'姓名',
             align:"center",
-            dataIndex: 'nickName'
+            dataIndex: 'name'
           },
           {
-            title:'用户头像',
-            align:"center",
-            dataIndex: 'headImage',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'手机号码',
+            title:'电话',
             align:"center",
             dataIndex: 'phone'
           },
           {
-            title:'小程序标识',
-            align:"center",
-            dataIndex: 'appletOpenid'
-          },
-          {
-            title:'性别',
-            align:"center",
-            dataIndex: 'sex'
-          },
-          {
-            title:'出生年',
-            align:"center",
-            dataIndex: 'yearDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'地址',
-            align:"center",
-            dataIndex: 'address'
-          },
-          {
-            title:'状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title:'国籍',
-            align:"center",
-            dataIndex: 'city'
-          },
-          {
-            title:'邮箱',
-            align:"center",
-            dataIndex: 'email'
-          },
-          {
-            title:'学历',
-            align:"center",
-            dataIndex: 'shcool'
-          },
-          {
-            title:'院校类型',
+            title:'头像',
             align:"center",
-            dataIndex: 'shcoolType'
+            dataIndex: 'headImage'
           },
           {
-            title:'工作',
+            title:'招募项目',
             align:"center",
-            dataIndex: 'workValue'
+            dataIndex: 'recruitId'
           },
           {
-            title:'关于我',
+            title:'项目时间',
             align:"center",
-            dataIndex: 'details'
+            dataIndex: 'recruitTime'
           },
           {
             title: '操作',
@@ -225,11 +161,11 @@
           }
         ],
         url: {
-          list: "/hanHaiMember/hanHaiMember/list",
-          delete: "/hanHaiMember/hanHaiMember/delete",
-          deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch",
-          exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls",
-          importExcelUrl: "hanHaiMember/hanHaiMember/importExcel",
+          list: "/popularizeRecruitLog/popularizeRecruitLog/list",
+          delete: "/popularizeRecruitLog/popularizeRecruitLog/delete",
+          deleteBatch: "/popularizeRecruitLog/popularizeRecruitLog/deleteBatch",
+          exportXlsUrl: "/popularizeRecruitLog/popularizeRecruitLog/exportXls",
+          importExcelUrl: "popularizeRecruitLog/popularizeRecruitLog/importExcel",
           
         },
         dictOptions:{},
@@ -249,21 +185,12 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'string',value:'nickName',text:'用户昵称',dictCode:''})
-        fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
-        fieldList.push({type:'string',value:'appletOpenid',text:'小程序标识',dictCode:''})
-        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
-        fieldList.push({type:'date',value:'yearDate',text:'出生年'})
-        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
-        fieldList.push({type:'string',value:'state',text:'状态',dictCode:''})
-        fieldList.push({type:'string',value:'city',text:'国籍',dictCode:''})
-        fieldList.push({type:'string',value:'email',text:'邮箱',dictCode:''})
-        fieldList.push({type:'string',value:'shcool',text:'学历',dictCode:''})
-        fieldList.push({type:'string',value:'shcoolType',text:'院校类型',dictCode:''})
-        fieldList.push({type:'string',value:'workValue',text:'工作',dictCode:''})
-        fieldList.push({type:'Text',value:'details',text:'关于我',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户信息',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'Text',value:'headImage',text:'头像',dictCode:''})
+        fieldList.push({type:'string',value:'recruitId',text:'招募项目',dictCode:''})
+        fieldList.push({type:'datetime',value:'recruitTime',text:'项目时间'})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户信息"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="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="headImage">
+              <a-input v-model="model.headImage" placeholder="请输入头像"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招募项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recruitId">
+              <a-input v-model="model.recruitId" placeholder="请输入招募项目"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recruitTime">
+              <j-date placeholder="请选择项目时间"  v-model="model.recruitTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </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: 'PopularizeRecruitLogForm',
+    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: "/popularizeRecruitLog/popularizeRecruitLog/add",
+          edit: "/popularizeRecruitLog/popularizeRecruitLog/edit",
+          queryById: "/popularizeRecruitLog/popularizeRecruitLog/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/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue

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

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/popularizeRecruitLog/popularizeRecruitLog/list',
+  save='/popularizeRecruitLog/popularizeRecruitLog/add',
+  edit='/popularizeRecruitLog/popularizeRecruitLog/edit',
+  deleteOne = '/popularizeRecruitLog/popularizeRecruitLog/delete',
+  deleteBatch = '/popularizeRecruitLog/popularizeRecruitLog/deleteBatch',
+  importExcel = '/popularizeRecruitLog/popularizeRecruitLog/importExcel',
+  exportXls = '/popularizeRecruitLog/popularizeRecruitLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts

@@ -0,0 +1,73 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '用户信息',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '头像',
+    align:"center",
+    dataIndex: 'headImage'
+   },
+   {
+    title: '招募项目',
+    align:"center",
+    dataIndex: 'recruitId'
+   },
+   {
+    title: '项目时间',
+    align:"center",
+    dataIndex: 'recruitTime'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户信息',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '头像',
+    field: 'headImage',
+    component: 'Input',
+  },
+  {
+    label: '招募项目',
+    field: 'recruitId',
+    component: 'Input',
+  },
+  {
+    label: '项目时间',
+    field: 'recruitTime',
+    component: 'Input',
+  },
+];

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLogList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PopularizeRecruitLogModal @register="registerModal" @success="handleSuccess"></PopularizeRecruitLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="popularizeRecruitLog-popularizeRecruitLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import PopularizeRecruitLogModal from './components/PopularizeRecruitLogModal.vue'
+  import {columns, searchFormSchema} from './popularizeRecruitLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './popularizeRecruitLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '招募报名日志',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"招募报名日志",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/components/PopularizeRecruitLogModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../popularizeRecruitLog.data';
+    import {saveOrUpdate} from '../popularizeRecruitLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/controller/PopularizeSchoolSubController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.hanHaiMember.controller;
+package org.jeecg.modules.popularizeSchoolSub.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,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.hanHaiMember.entity.HanHaiMember;
-import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub;
+import org.jeecg.modules.popularizeSchoolSub.service.IPopularizeSchoolSubService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 用户账户表
+ * @Description: 学院标签
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-06
  * @Version: V1.0
  */
-@Api(tags="用户账户表")
+@Api(tags="学院标签")
 @RestController
-@RequestMapping("/hanHaiMember/hanHaiMember")
+@RequestMapping("/popularizeSchoolSub/popularizeSchoolSub")
 @Slf4j
-public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHaiMemberService> {
+public class PopularizeSchoolSubController extends JeecgController<PopularizeSchoolSub, IPopularizeSchoolSubService> {
 	@Autowired
-	private IHanHaiMemberService hanHaiMemberService;
+	private IPopularizeSchoolSubService popularizeSchoolSubService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param hanHaiMember
+	 * @param popularizeSchoolSub
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "用户账户表-分页列表查询")
-	@ApiOperation(value="用户账户表-分页列表查询", notes="用户账户表-分页列表查询")
+	//@AutoLog(value = "学院标签-分页列表查询")
+	@ApiOperation(value="学院标签-分页列表查询", notes="学院标签-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<HanHaiMember>> queryPageList(HanHaiMember hanHaiMember,
+	public Result<IPage<PopularizeSchoolSub>> queryPageList(PopularizeSchoolSub popularizeSchoolSub,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<HanHaiMember> queryWrapper = QueryGenerator.initQueryWrapper(hanHaiMember, req.getParameterMap());
-		Page<HanHaiMember> page = new Page<HanHaiMember>(pageNo, pageSize);
-		IPage<HanHaiMember> pageList = hanHaiMemberService.page(page, queryWrapper);
+		QueryWrapper<PopularizeSchoolSub> queryWrapper = QueryGenerator.initQueryWrapper(popularizeSchoolSub, req.getParameterMap());
+		Page<PopularizeSchoolSub> page = new Page<PopularizeSchoolSub>(pageNo, pageSize);
+		IPage<PopularizeSchoolSub> pageList = popularizeSchoolSubService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param hanHaiMember
+	 * @param popularizeSchoolSub
 	 * @return
 	 */
-	@AutoLog(value = "用户账户表-添加")
-	@ApiOperation(value="用户账户表-添加", notes="用户账户表-添加")
+	@AutoLog(value = "学院标签-添加")
+	@ApiOperation(value="学院标签-添加", notes="学院标签-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody HanHaiMember hanHaiMember) {
-		hanHaiMemberService.save(hanHaiMember);
+	public Result<String> add(@RequestBody PopularizeSchoolSub popularizeSchoolSub) {
+		popularizeSchoolSubService.save(popularizeSchoolSub);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param hanHaiMember
+	 * @param popularizeSchoolSub
 	 * @return
 	 */
-	@AutoLog(value = "用户账户表-编辑")
-	@ApiOperation(value="用户账户表-编辑", notes="用户账户表-编辑")
+	@AutoLog(value = "学院标签-编辑")
+	@ApiOperation(value="学院标签-编辑", notes="学院标签-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody HanHaiMember hanHaiMember) {
-		hanHaiMemberService.updateById(hanHaiMember);
+	public Result<String> edit(@RequestBody PopularizeSchoolSub popularizeSchoolSub) {
+		popularizeSchoolSubService.updateById(popularizeSchoolSub);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -106,11 +106,11 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "用户账户表-通过id删除")
-	@ApiOperation(value="用户账户表-通过id删除", notes="用户账户表-通过id删除")
+	@AutoLog(value = "学院标签-通过id删除")
+	@ApiOperation(value="学院标签-通过id删除", notes="学院标签-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		hanHaiMemberService.removeById(id);
+		popularizeSchoolSubService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -120,11 +120,11 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "用户账户表-批量删除")
-	@ApiOperation(value="用户账户表-批量删除", notes="用户账户表-批量删除")
+	@AutoLog(value = "学院标签-批量删除")
+	@ApiOperation(value="学院标签-批量删除", notes="学院标签-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(",")));
+		this.popularizeSchoolSubService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -134,26 +134,26 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "用户账户表-通过id查询")
-	@ApiOperation(value="用户账户表-通过id查询", notes="用户账户表-通过id查询")
+	//@AutoLog(value = "学院标签-通过id查询")
+	@ApiOperation(value="学院标签-通过id查询", notes="学院标签-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<HanHaiMember> queryById(@RequestParam(name="id",required=true) String id) {
-		HanHaiMember hanHaiMember = hanHaiMemberService.getById(id);
-		if(hanHaiMember==null) {
+	public Result<PopularizeSchoolSub> queryById(@RequestParam(name="id",required=true) String id) {
+		PopularizeSchoolSub popularizeSchoolSub = popularizeSchoolSubService.getById(id);
+		if(popularizeSchoolSub==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(hanHaiMember);
+		return Result.OK(popularizeSchoolSub);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param hanHaiMember
+    * @param popularizeSchoolSub
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HanHaiMember hanHaiMember) {
-        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "用户账户表");
+    public ModelAndView exportXls(HttpServletRequest request, PopularizeSchoolSub popularizeSchoolSub) {
+        return super.exportXls(request, popularizeSchoolSub, PopularizeSchoolSub.class, "学院标签");
     }
 
     /**
@@ -165,7 +165,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, HanHaiMember.class);
+        return super.importExcel(request, response, PopularizeSchoolSub.class);
     }
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/entity/PopularizeSchoolSub.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.popularizeSchoolSub.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 学院标签
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("popularize_school_sub")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="popularize_school_sub对象", description="学院标签")
+public class PopularizeSchoolSub implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private java.lang.String title;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+    private java.lang.Integer sort;
+}

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/mapper/PopularizeSchoolSubMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.popularizeSchoolSub.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 学院标签
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+public interface PopularizeSchoolSubMapper extends BaseMapper<PopularizeSchoolSub> {
+
+}

module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/mapper/xml/PopularizeSchoolSubMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.hanHaiMember.mapper.HanHaiMemberMapper">
+<mapper namespace="org.jeecg.modules.popularizeSchoolSub.mapper.PopularizeSchoolSubMapper">
 
 </mapper>

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/service/IPopularizeSchoolSubService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.popularizeSchoolSub.service;
+
+import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 学院标签
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+public interface IPopularizeSchoolSubService extends IService<PopularizeSchoolSub> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/service/impl/PopularizeSchoolSubServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.popularizeSchoolSub.service.impl;
+
+import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub;
+import org.jeecg.modules.popularizeSchoolSub.mapper.PopularizeSchoolSubMapper;
+import org.jeecg.modules.popularizeSchoolSub.service.IPopularizeSchoolSubService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 学院标签
+ * @Author: jeecg-boot
+ * @Date:   2025-01-06
+ * @Version: V1.0
+ */
+@Service
+public class PopularizeSchoolSubServiceImpl extends ServiceImpl<PopularizeSchoolSubMapper, PopularizeSchoolSub> implements IPopularizeSchoolSubService {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue/PopularizeSchoolSubList.vue

@@ -0,0 +1,177 @@
+<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>
+      <!-- 高级查询区域 -->
+      <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-school-sub-modal ref="modalForm" @ok="modalFormOk"></popularize-school-sub-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeSchoolSubModal from './modules/PopularizeSchoolSubModal'
+
+  export default {
+    name: 'PopularizeSchoolSubList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeSchoolSubModal
+    },
+    data () {
+      return {
+        description: '学院标签管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'标签',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'排序',
+            align:"center",
+            dataIndex: 'sort'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeSchoolSub/popularizeSchoolSub/list",
+          delete: "/popularizeSchoolSub/popularizeSchoolSub/delete",
+          deleteBatch: "/popularizeSchoolSub/popularizeSchoolSub/deleteBatch",
+          exportXlsUrl: "/popularizeSchoolSub/popularizeSchoolSub/exportXls",
+          importExcelUrl: "popularizeSchoolSub/popularizeSchoolSub/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'title',text:'标签',dictCode:''})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue/modules/PopularizeSchoolSubForm.vue

@@ -0,0 +1,109 @@
+<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="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </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: 'PopularizeSchoolSubForm',
+    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: "/popularizeSchoolSub/popularizeSchoolSub/add",
+          edit: "/popularizeSchoolSub/popularizeSchoolSub/edit",
+          queryById: "/popularizeSchoolSub/popularizeSchoolSub/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/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue/modules/PopularizeSchoolSubModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <han-hai-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></han-hai-member-form>
+    <popularize-school-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-school-sub-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import HanHaiMemberForm from './HanHaiMemberForm'
+  import PopularizeSchoolSubForm from './PopularizeSchoolSubForm'
 
   export default {
-    name: 'HanHaiMemberModal',
+    name: 'PopularizeSchoolSubModal',
     components: {
-      HanHaiMemberForm
+      PopularizeSchoolSubForm
     },
     data () {
       return {

module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue/modules/PopularizeSchoolSubModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <han-hai-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></han-hai-member-form>
+    <popularize-school-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-school-sub-form>
   </j-modal>
 </template>
 
 <script>
 
-  import HanHaiMemberForm from './HanHaiMemberForm'
+  import PopularizeSchoolSubForm from './PopularizeSchoolSubForm'
   export default {
-    name: 'HanHaiMemberModal',
+    name: 'PopularizeSchoolSubModal',
     components: {
-      HanHaiMemberForm
+      PopularizeSchoolSubForm
     },
     data () {
       return {

module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue3/PopularizeSchoolSub.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/hanHaiMember/hanHaiMember/list',
-  save='/hanHaiMember/hanHaiMember/add',
-  edit='/hanHaiMember/hanHaiMember/edit',
-  deleteOne = '/hanHaiMember/hanHaiMember/delete',
-  deleteBatch = '/hanHaiMember/hanHaiMember/deleteBatch',
-  importExcel = '/hanHaiMember/hanHaiMember/importExcel',
-  exportXls = '/hanHaiMember/hanHaiMember/exportXls',
+  list = '/popularizeSchoolSub/popularizeSchoolSub/list',
+  save='/popularizeSchoolSub/popularizeSchoolSub/add',
+  edit='/popularizeSchoolSub/popularizeSchoolSub/edit',
+  deleteOne = '/popularizeSchoolSub/popularizeSchoolSub/delete',
+  deleteBatch = '/popularizeSchoolSub/popularizeSchoolSub/deleteBatch',
+  importExcel = '/popularizeSchoolSub/popularizeSchoolSub/importExcel',
+  exportXls = '/popularizeSchoolSub/popularizeSchoolSub/exportXls',
 }
 /**
  * 导出api

module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue3/PopularizeSchoolSub.data.ts

@@ -0,0 +1,33 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '标签',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '排序',
+    align:"center",
+    dataIndex: 'sort'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '标签',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '排序',
+    field: 'sort',
+    component: 'InputNumber',
+  },
+];

module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue3/PopularizeSchoolSubList.vue

@@ -35,25 +35,25 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <HanHaiMemberModal @register="registerModal" @success="handleSuccess"></HanHaiMemberModal>
+    <PopularizeSchoolSubModal @register="registerModal" @success="handleSuccess"></PopularizeSchoolSubModal>
   </div>
 </template>
 
-<script lang="ts" name="hanHaiMember-hanHaiMember" setup>
+<script lang="ts" name="popularizeSchoolSub-popularizeSchoolSub" setup>
   import {ref, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import {useModal} from '/@/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage'
-  import HanHaiMemberModal from './components/HanHaiMemberModal.vue'
-  import {columns, searchFormSchema} from './hanHaiMember.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './hanHaiMember.api';
+  import PopularizeSchoolSubModal from './components/PopularizeSchoolSubModal.vue'
+  import {columns, searchFormSchema} from './popularizeSchoolSub.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './popularizeSchoolSub.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '用户账户表',
+           title: '学院标签',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"用户账户表",
+            name:"学院标签",
             url: getExportUrl,
           },
           importConfig: {

module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue → module-common/src/main/java/org/jeecg/modules/popularizeSchoolSub/vue3/components/PopularizeSchoolSubModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../hanHaiMember.data';
-    import {saveOrUpdate} from '../hanHaiMember.api';
+    import {formSchema} from '../popularizeSchoolSub.data';
+    import {saveOrUpdate} from '../popularizeSchoolSub.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

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

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

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

@@ -4,11 +4,15 @@ 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;
+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;
@@ -20,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 旅行信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Data
@@ -82,15 +86,15 @@ public class PopularizeTravel implements Serializable {
 	/**活动人数*/
 	@Excel(name = "活动人数", width = 15)
     @ApiModelProperty(value = "活动人数")
-    private java.lang.String sum;
+    private java.lang.Integer sum;
 	/**报名人数*/
 	@Excel(name = "报名人数", width = 15)
     @ApiModelProperty(value = "报名人数")
-    private java.lang.String num;
+    private java.lang.Integer num;
 	/**报名价格*/
 	@Excel(name = "报名价格", width = 15)
     @ApiModelProperty(value = "报名价格")
-    private java.lang.String price;
+    private java.math.BigDecimal price;
 	/**主理人*/
 	@Excel(name = "主理人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@@ -108,7 +112,7 @@ public class PopularizeTravel implements Serializable {
 	@Excel(name = "活动状态", width = 15, dicCode = "no_state")
 	@Dict(dicCode = "no_state")
     @ApiModelProperty(value = "活动状态")
-    private java.lang.String state;
+    private java.lang.String  state;
 	/**详情图*/
 	@Excel(name = "详情图", width = 15)
     @ApiModelProperty(value = "详情图")
@@ -153,4 +157,7 @@ public class PopularizeTravel implements Serializable {
 	@Excel(name = "英文-代理说明", width = 15)
     @ApiModelProperty(value = "英文-代理说明")
     private java.lang.String enDl;
+
+    @TableField(exist = false)
+    private List<PopularizeOrder> orderList;
 }

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:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 public interface PopularizeTravelMapper extends BaseMapper<PopularizeTravel> {

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:   2024-12-19
+ * @Date:   2025-01-02
  * @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:   2024-12-19
+ * @Date:   2025-01-02
  * @Version: V1.0
  */
 @Service

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

@@ -290,13 +290,13 @@
         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:'string',value:'sum',text:'活动人数',dictCode:''})
-        fieldList.push({type:'string',value:'num',text:'报名人数',dictCode:''})
-        fieldList.push({type:'string',value:'price',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:'string',value:'openNum',text:'签到人数',dictCode:''})
         fieldList.push({type:'switch',value:'isOpen',text:'是否上架'})
-        fieldList.push({type:'string',value:'state',text:'活动状态',dictCode:'no_state'})
+        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:''})

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

@@ -35,17 +35,17 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="活动人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sum">
-              <a-input v-model="model.sum" placeholder="请输入活动人数"  ></a-input>
+              <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 v-model="model.num" placeholder="请输入报名人数"  ></a-input>
+              <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="price">
-              <a-input v-model="model.price" placeholder="请输入报名价格"  ></a-input>
+              <a-input-number v-model="model.price" placeholder="请输入报名价格" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

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

@@ -176,17 +176,17 @@ export const formSchema: FormSchema[] = [
   {
     label: '活动人数',
     field: 'sum',
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '报名人数',
     field: 'num',
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '报名价格',
     field: 'price',
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '主理人',

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

@@ -1,5 +1,5 @@
 server:
-  port: 8001
+  port: 8005
   tomcat:
     max-swallow-size: -1
   error:
@@ -341,10 +341,10 @@ third-app:
 
 ##配置微信 - 推广项目
 wechat-dm:
-  mpAppId: wx4bf1b331b5f4e8d8
-  mpAppSecret: d036e09b684fbe44977804460555f5f9
+  mpAppId: wx797abcfb479c75ec
+  mpAppSecret: c4565acc18698a7000be1b2bb748be81
   mchId: 1659066870
-  mchKey: 16E62990A62A582A726F78C5CADD4A0E
+  mchKey: vtribevtribevtribevtribevtribe12
   keyPath:
   notifyUrl:
 

module-system/src/main/resources/pay_weixin.properties

@@ -1,10 +1,10 @@
-pay.mchId=1700534180
-pay.appId=wx0839bc52e7849c13
-pay.mchKey=9bde2770a74c2a460592de2d451ce05f
+pay.mchId=1659066870
+pay.appId=wx797abcfb479c75ec
+pay.mchKey=vtribevtribevtribevtribevtribe12
 pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
-pay.notifyUrlDev=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
-pay.notifyOneUrl=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
-pay.notifyUrlOneDev=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
+pay.notifyUrl=https://popularize-admin.hhlm1688.com/popularize-admin/order_common/payNotify
+pay.notifyUrlDev=https://popularize-admin.hhlm1688.com//popularize-admin/order_common/payNotify
+pay.notifyOneUrl=https://popularize-admin.hhlm1688.com//popularize-admin/order_common/payNotify
+pay.notifyUrlOneDev=https://popularize-admin.hhlm1688.com//popularize-admin/order_common/payNotify