修复

.idea/compiler.xml

@@ -19,16 +19,16 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="base-api" options="-parameters" />
+      <module name="base-api" options="" />
       <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="-parameters" />
+      <module name="module-base" options="" />
       <module name="module-common" options="-parameters" />
       <module name="module-pay" options="-parameters" />
       <module name="module-system" options="-parameters" />
-      <module name="popularize-admin" options="-parameters" />
+      <module name="popularize-admin" options="" />
     </option>
   </component>
 </project>

.idea/encodings.xml

@@ -3,13 +3,10 @@
   <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,7 +1,7 @@
-NODE_ENV=development
-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
-
-# 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
-VUE_APP_SUB_jeecg-app-1 = '//localhost:8092'
+NODE_ENV=development
+VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
+VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
+VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
+
+# 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
+VUE_APP_SUB_jeecg-app-1 = '//localhost:8092'

admin-pc/.env.production

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

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:   2025-01-02
+ * @Date:   2025-01-13
  * @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:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 @Data
@@ -239,4 +239,8 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "关于我", width = 15)
     @ApiModelProperty(value = "关于我")
     private java.lang.String details;
+	/**是否主理人*/
+	@Excel(name = "是否主理人", width = 15)
+    @ApiModelProperty(value = "是否主理人")
+    private java.lang.String isUser;
 }

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

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

@@ -114,6 +114,7 @@
   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',
@@ -212,6 +213,12 @@
             align:"center",
             dataIndex: 'details'
           },
+          {
+            title:'是否主理人',
+            align:"center",
+            dataIndex: 'isUser',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUser'], text) : ''),
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -234,6 +241,7 @@
       }
     },
     created() {
+      this.$set(this.dictOptions, 'isUser', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -261,6 +269,7 @@
         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:'switch',value:'isUser',text:'是否主理人'})
         this.superFieldList = fieldList
       }
     }

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

@@ -73,6 +73,11 @@
               <a-textarea v-model="model.details" rows="4" placeholder="请输入关于我" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否主理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isUser">
+              <j-switch v-model="model.isUser"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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

@@ -80,6 +80,14 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'details'
    },
+   {
+    title: '是否主理人',
+    align:"center",
+    dataIndex: 'isUser',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -164,4 +172,11 @@ export const formSchema: FormSchema[] = [
     field: 'details',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
+  {
+    label: '是否主理人',
+    field: 'isUser',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
 ];

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,String state,PageBean pageBean) {
-        return apiIndexService.getActivityPageList(title,state, pageBean);
+    public Result<?> getActivityPageList(String title,String state,String timeStr,String cityId,PageBean pageBean) {
+        return apiIndexService.getActivityPageList(title,state,timeStr, cityId,pageBean);
     }
 
     //活动详情
@@ -61,8 +61,8 @@ public class ApiIndexController {
     //获取旅行列表带分页
     @ApiOperation(value="获取旅行列表带分页", notes="获取旅行列表带分页")
     @GetMapping(value = "/getTravelPageList")
-    public Result<?> getTravelPageList(String title,String state, PageBean pageBean) {
-        return apiIndexService.getTravelPageList(title, state, pageBean);
+    public Result<?> getTravelPageList(String title,String state,String timeStr, PageBean pageBean) {
+        return apiIndexService.getTravelPageList(title, state, timeStr,pageBean);
     }
 
 
@@ -79,8 +79,8 @@ public class ApiIndexController {
     //我的收藏
     @ApiOperation(value="我的收藏", notes="我的收藏")
     @GetMapping(value = "/getCollectPageList")
-    public Result<?> getCollectPageList(@RequestHeader("X-Access-Token") String token, PageBean pageBean) {
-        return apiIndexService.getCollectPageList(token, pageBean);
+    public Result<?> getCollectPageList(@RequestHeader("X-Access-Token") String token,String type, PageBean pageBean) {
+        return apiIndexService.getCollectPageList(token,type, pageBean);
     }
 
 

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

@@ -80,8 +80,8 @@ public class ApiOrderController {
     //收藏
     @ApiOperation(value="收藏", notes="收藏")
     @PostMapping(value = "/collect")
-    public Result<?> collect(@RequestHeader("X-Access-Token") String token, String id) {
-        return apiIndexService.collect(token,id);
+    public Result<?> collect(@RequestHeader("X-Access-Token") String token, String id,String type) {
+        return apiIndexService.collect(token,id,type);
     }
 
 
@@ -96,6 +96,15 @@ public class ApiOrderController {
     }
 
 
+
+
+
+
+
+
+
+
+
     //支付回调
     //支付回调
     @PostMapping("/payNotify")

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

@@ -57,16 +57,16 @@ public class ApiShopUserController {
     //主理人主理的活动列表带分页
     @ApiOperation(value="主理人主理的活动列表带分页", notes="主理人主理的活动列表带分页")
     @GetMapping(value = "/getActivityMemberPageList")
-    public Result<?> getActivityMemberPageList(@RequestHeader("X-Access-Token") String token, String title,Integer type, PageBean pageBean){
-        return apiIndexService.getActivityMemberPageList(token,title,type, pageBean);
+    public Result<?> getActivityMemberPageList(@RequestHeader("X-Access-Token") String token, String title,Integer type, String timeStr,String cityId,PageBean pageBean){
+        return apiIndexService.getActivityMemberPageList(token,title,type, timeStr,cityId,pageBean);
     }
 
 
     //主理人主理的活动签到里面的签到用户列表带分页
     @ApiOperation(value="主理人主理的活动签到里面的签到用户列表带分页", notes="主理人主理的活动签到里面的签到用户列表带分页")
     @GetMapping(value = "/getSignInUserPageList")
-    public Result<?> getSignInUserPageList(String recruitId, PageBean pageBean){
-        return apiIndexService.getSignInUserPageList(recruitId, pageBean);
+    public Result<?> getSignInUserPageList(@RequestHeader("X-Access-Token") String token,String recruitId, PageBean pageBean){
+        return apiIndexService.getSignInUserPageList(token,recruitId, pageBean);
     }
 
 

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

@@ -18,20 +18,20 @@ public interface ApiIndexService {
     Result<?> getYueDong();
 
     //获取首页活动列表带分页
-    Result<?> getActivityPageList(String title,String state, PageBean pageBean);
+    Result<?> getActivityPageList(String title,String state,String timeStr,String cityId, PageBean pageBean);
 
     //获取活动详情
     Result<?> getActivityInfo(String activityId);
 
     //获取旅行列表带分页
-    Result<?> getTravelPageList(String title, String state,PageBean pageBean);
+    Result<?> getTravelPageList(String title, String state,String timeStr,PageBean pageBean);
 
     //旅行详情
     Result<?> getTravelInfo(String travelId);
 
 
     //获取我的收藏带分页
-    Result<?> getCollectPageList(String token, PageBean pageBean);
+    Result<?> getCollectPageList(String token,String type, PageBean pageBean);
 
 
     Result<?> getTwoPageList(String token,Integer type, PageBean pageBean);
@@ -61,7 +61,7 @@ public interface ApiIndexService {
 
 
     //收藏
-    Result<?> collect(String token,String activityId);
+    Result<?> collect(String token,String id,String type);
 
 
 
@@ -82,11 +82,12 @@ public interface ApiIndexService {
     //获取主理人认证信息
     Result<?> getJoinRecruitInfo(String token);
 
-    Result<?> getActivityMemberPageList( String token, String title,Integer type, PageBean pageBean);
+
+    Result<?> getActivityMemberPageList( String token, String title,Integer type, String timeStr,String cityId, PageBean pageBean);
 
 
     //主理人主理的活动签到里面的签到用户列表带分页
-    Result<?> getSignInUserPageList(String recruitId, PageBean pageBean);
+    Result<?> getSignInUserPageList( String token,String recruitId, PageBean pageBean);
 
     //扫码签到
     Result<?> scanSignIn(String recruitId);
@@ -96,19 +97,12 @@ public interface ApiIndexService {
 
 
 
-
-
-
-
     //创建订单
     Result<?> createOrder(String token, String id,Integer typePrice,Integer type);
 
     //商城-支付回调
     Object payNotify(String requestBody);
 
-
-
-
     //获取国籍
     Result<?> getNationalityPageList(String title, PageBean pageBean);
     //获取城市

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

@@ -42,6 +42,7 @@ import org.jeecg.modules.popularizeSchool.entity.PopularizeSchool;
 import org.jeecg.modules.popularizeSchool.service.IPopularizeSchoolService;
 import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub;
 import org.jeecg.modules.popularizeSchoolSub.service.IPopularizeSchoolSubService;
+import org.jeecg.modules.popularizeSignLog.entity.PopularizeSignLog;
 import org.jeecg.modules.popularizeSignLog.service.IPopularizeSignLogService;
 import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
 import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService;
@@ -127,7 +128,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     //获取首页活动列表带分页
     @Override
-    public Result<?> getActivityPageList(String title, String state, PageBean pageBean){
+    public Result<?> getActivityPageList(String title, String state,String timeStr,String cityId, PageBean pageBean){
         Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeActivity> page1 = popularizeActivityService
                 .lambdaQuery()
@@ -143,6 +144,30 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .orderByDesc(PopularizeActivity::getCreateTime)
                     .page(page);
         }
+        //如果时间不为空
+        if(StringUtils.isNotBlank(timeStr)){
+            page1 = popularizeActivityService
+                    .lambdaQuery()
+                    .like(PopularizeActivity::getStartTime,timeStr)
+                    .eq(PopularizeActivity::getState,state)
+                    .orderByDesc(PopularizeActivity::getCreateTime)
+                    .page(page);
+        }
+        //如果地址不为空
+        if(StringUtils.isNotBlank(cityId)){
+            page1 = popularizeActivityService
+                    .lambdaQuery()
+                    .eq(PopularizeActivity::getAddress,cityId)
+                    .eq(PopularizeActivity::getState,state)
+                    .orderByDesc(PopularizeActivity::getCreateTime)
+                    .page(page);
+        }
+
+
+
+
+
+
         //得到集合
         List<PopularizeActivity> records = page1.getRecords();
         //创建一个新的集合
@@ -188,7 +213,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     //获取旅行列表带分页
     @Override
-    public Result<?> getTravelPageList(String title,String state, PageBean pageBean){
+    public Result<?> getTravelPageList(String title,String state, String timeStr,PageBean pageBean){
         Page<PopularizeTravel> page = new Page<PopularizeTravel>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeTravel> page1 = popularizeTravelService
                 .lambdaQuery()
@@ -203,6 +228,15 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .orderByDesc(PopularizeTravel::getCreateTime)
                     .page(page);
         }
+        //如果时间不为空
+        if(StringUtils.isNotBlank(timeStr)){
+            page1 = popularizeTravelService
+                    .lambdaQuery()
+                    .like(PopularizeTravel::getStartTime,timeStr)
+                    .eq(PopularizeTravel::getState,state)
+                    .orderByDesc(PopularizeTravel::getCreateTime)
+                    .page(page);
+        }
 
         //得到集合
         List<PopularizeTravel> records = page1.getRecords();
@@ -253,7 +287,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
 
     @Override
-    public Result<?> getCollectPageList(String token, PageBean pageBean){
+    public Result<?> getCollectPageList(String token,String type, PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeOrder> page1 = popularizeOrderService
@@ -261,6 +295,14 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
                 .orderByDesc(PopularizeOrder::getCreateTime)
                 .page(page);
+        if(StringUtils.isNotBlank(type)){
+            page1 = popularizeOrderService
+                    .lambdaQuery()
+                    .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
+                    .eq(PopularizeOrder::getType,type)
+                    .orderByDesc(PopularizeOrder::getCreateTime)
+                    .page(page);
+        }
         return Result.OK(page1);
     }
 
@@ -270,9 +312,9 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     public Result<?> getTwoPageList(String token,Integer type, PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         if(type == 1){
-            return this.getTravelPageList(null,"1",pageBean);
+            return this.getTravelPageList(null,"1",null,pageBean);
         }else{
-            return this.getActivityPageList(null,"1",pageBean);
+            return this.getActivityPageList(null,"1",null,null,pageBean);
         }
     }
 
@@ -287,6 +329,8 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         Page<PopularizeOrder> page1 = popularizeOrderService
                 .lambdaQuery()
                 .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
+                //状态不等于0
+                .ne(PopularizeOrder::getState,0)
                 .orderByDesc(PopularizeOrder::getCreateTime)
                 .page(page);
         if(StringUtils.isNotBlank(state)){
@@ -294,6 +338,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .lambdaQuery()
                     .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
                     .eq(PopularizeOrder::getState,state)
+                    .ne(PopularizeOrder::getState,0)
                     .orderByDesc(PopularizeOrder::getCreateTime)
                     .page(page);
         }
@@ -427,17 +472,48 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     //收藏
     @Override
-    public Result<?> collect(String token,String activityId){
+    public Result<?> collect(String token,String id,String type){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        PopularizeCollect byId = popularizeCollectService.getById(activityId);
+        PopularizeCollect byId = popularizeCollectService
+                .lambdaQuery()
+                .eq(PopularizeCollect::getUserId,hanHaiMember.getId())
+                .eq(PopularizeCollect::getActivityId,id)
+                .eq(PopularizeCollect::getType,type)
+                .one();
+        if(type.equals("0")){
+            byId = popularizeCollectService
+                    .lambdaQuery()
+                    .eq(PopularizeCollect::getUserId,hanHaiMember.getId())
+                    .eq(PopularizeCollect::getActivityId,id)
+                    .eq(PopularizeCollect::getType,type)
+                    .one();
+        }else{
+            byId = popularizeCollectService
+                    .lambdaQuery()
+                    .eq(PopularizeCollect::getUserId,hanHaiMember.getId())
+                    .eq(PopularizeCollect::getTravelId,id)
+                    .eq(PopularizeCollect::getType,type)
+                    .one();
+        }
+
+
+
+
+
         //如果不为空则删除数据取消收藏
         if(byId != null){
             popularizeCollectService.removeById(byId.getId());
             return Result.OK("取消收藏成功");
         }else{
             byId = new PopularizeCollect();
+            if(type.equals("0")){
+                byId.setActivityId(id);
+            }else{
+                byId.setTravelId(id);
+            }
+            byId.setType(type);
             byId.setUserId(hanHaiMember.getId());
-            byId.setActivityId(activityId);
+            byId.setActivityId(id);
             byId.setCreateTime(new Date());
             popularizeCollectService.save(byId);
             return Result.OK("收藏成功");
@@ -543,27 +619,34 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
 
     @Override
-    public Result<?> getActivityMemberPageList( String token, String title, Integer type,PageBean pageBean){
+    public Result<?> getActivityMemberPageList( String token, String title, Integer type, String timeStr,String cityId,PageBean pageBean){
 
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         if(type == 1){
-            return this.getTravelPageList(null,"1",pageBean);
+            return this.getTravelPageList(null,"1",timeStr,pageBean);
         }else{
-            return this.getActivityPageList(null,"1",pageBean);
+            return this.getActivityPageList(null,"1",timeStr,cityId,pageBean);
         }
     }
+
+
     //招募活动签到里面的签到用户列表带分页
     @Override
-    public Result<?> getSignInUserPageList(String recruitId, PageBean pageBean){
-        return Result.OK();
+    public Result<?> getSignInUserPageList(String token, String recruitId, PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<PopularizeSignLog> page = new Page<PopularizeSignLog>(pageBean.getPageNo(), pageBean.getPageSize());
+        return Result.OK(page);
     }
 
+
     //扫码签到
     @Override
     public Result<?> scanSignIn(String recruitId){
         return Result.OK();
     }
 
+
+
     //点击参与招募
     @Override
     public Result<?> shopUserAuth(String token,String recruitId){

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:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 @Api(tags="活动信息表")

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

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 活动信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 @Data
@@ -154,7 +154,15 @@ public class PopularizeActivity implements Serializable {
 	@Excel(name = "活动需知", width = 15)
     @ApiModelProperty(value = "活动需知")
     private java.lang.String orderDetails;
-
+	/**活动城市*/
+	@Excel(name = "活动城市", width = 15, dictTable = "popularize_city", dicText = "city", dicCode = "id")
+	@Dict(dictTable = "popularize_city", dicText = "city", dicCode = "id")
+    @ApiModelProperty(value = "活动城市")
+    private java.lang.String cityId;
+	/**签到人数*/
+	@Excel(name = "签到人数", width = 15)
+    @ApiModelProperty(value = "签到人数")
+    private java.lang.Integer doNum;
 
     @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:   2025-01-02
+ * @Date:   2025-01-13
  * @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:   2025-01-02
+ * @Date:   2025-01-13
  * @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:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 @Service

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

@@ -292,6 +292,16 @@
             align:"center",
             dataIndex: 'orderDetails'
           },
+          {
+            title:'活动城市',
+            align:"center",
+            dataIndex: 'cityId_dictText'
+          },
+          {
+            title:'签到人数',
+            align:"center",
+            dataIndex: 'doNum'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -353,6 +363,8 @@
         fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
         fieldList.push({type:'Text',value:'orderDetails',text:'活动需知',dictCode:''})
+        fieldList.push({type:'sel_search',value:'cityId',text:'活动城市',dictTable:"popularize_city", dictText:'city', dictCode:'id'})
+        fieldList.push({type:'int',value:'doNum',text:'签到人数',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -123,6 +123,16 @@
               <a-textarea v-model="model.orderDetails" rows="4" placeholder="请输入活动需知" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="活动城市" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cityId">
+              <j-search-select-tag v-model="model.cityId" dict="popularize_city,city,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="签到人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="doNum">
+              <a-input-number v-model="model.doNum" placeholder="请输入签到人数" style="width: 100%" />
+            </a-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

@@ -119,6 +119,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'orderDetails'
    },
+   {
+    title: '活动城市',
+    align:"center",
+    dataIndex: 'cityId_dictText'
+   },
+   {
+    title: '签到人数',
+    align:"center",
+    dataIndex: 'doNum'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -326,4 +336,17 @@ export const formSchema: FormSchema[] = [
     field: 'orderDetails',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
+  {
+    label: '活动城市',
+    field: 'cityId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"popularize_city,city,id"
+    },
+  },
+  {
+    label: '签到人数',
+    field: 'doNum',
+    component: 'InputNumber',
+  },
 ];

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

@@ -4,7 +4,10 @@ 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;
@@ -120,4 +123,6 @@ public class PopularizeOrder implements Serializable {
 	@Excel(name = "是否已评价", width = 15)
     @ApiModelProperty(value = "是否已评价")
     private java.lang.String isPj;
+
+
 }

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:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 @Api(tags="旅行信息表")

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

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 旅行信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 @Data
@@ -112,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.Integer state;
 	/**详情图*/
 	@Excel(name = "详情图", width = 15)
     @ApiModelProperty(value = "详情图")
@@ -157,6 +157,10 @@ public class PopularizeTravel implements Serializable {
 	@Excel(name = "英文-代理说明", width = 15)
     @ApiModelProperty(value = "英文-代理说明")
     private java.lang.String enDl;
+	/**签到人数*/
+	@Excel(name = "签到人数", width = 15)
+    @ApiModelProperty(value = "签到人数")
+    private java.lang.Integer doNum;
 
     @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:   2025-01-02
+ * @Date:   2025-01-13
  * @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:   2025-01-02
+ * @Date:   2025-01-13
  * @Version: V1.0
  */
 public interface IPopularizeTravelService extends IService<PopularizeTravel> {

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

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

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

@@ -247,6 +247,11 @@
             align:"center",
             dataIndex: 'state_dictText'
           },
+          {
+            title:'签到人数',
+            align:"center",
+            dataIndex: 'doNum'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -308,6 +313,7 @@
         fieldList.push({type:'Text',value:'enXz',text:'英文-需知说明',dictCode:''})
         fieldList.push({type:'Text',value:'dl',text:'中文-代理说明',dictCode:''})
         fieldList.push({type:'Text',value:'enDl',text:'英文-代理说明',dictCode:''})
+        fieldList.push({type:'int',value:'doNum',text:'签到人数',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -123,6 +123,11 @@
               <a-textarea v-model="model.enDl" rows="4" placeholder="请输入英文-代理说明" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="签到人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="doNum">
+              <a-input-number v-model="model.doNum" placeholder="请输入签到人数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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

@@ -84,6 +84,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'state_dictText'
    },
+   {
+    title: '签到人数',
+    align:"center",
+    dataIndex: 'doNum'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -271,4 +276,9 @@ export const formSchema: FormSchema[] = [
     field: 'enDl',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
+  {
+    label: '签到人数',
+    field: 'doNum',
+    component: 'InputNumber',
+  },
 ];

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

@@ -1,5 +1,5 @@
 server:
-  port: 8005
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error: