修复bug

.gitignore

@@ -0,0 +1 @@
+target

.idea/jarRepositories.xml

@@ -26,5 +26,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

.idea/popularize-admin.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />

admin-pc/.env.development

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

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

@@ -141,6 +141,68 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         return Result.OK(list);
     }
 
+    //获取首页活动列表带分页
+    @Override
+    public Result<?> getActivityPageList(String title, String state,String timeStr,String cityId, PageBean pageBean){
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 添加活动时间在当前时间之前的条件
+        popularizeActivityService
+                .lambdaUpdate()
+                .like(title!= null, PopularizeActivity::getTitle, title)
+                .lt(PopularizeActivity::getStartTime, now)
+                .eq(PopularizeActivity::getState, "0")
+                .set(PopularizeActivity::getType, "1")
+                .set(PopularizeActivity::getState, 1)
+                .update();
+
+        popularizeActivityService
+                .lambdaUpdate()
+                .like(title!= null, PopularizeActivity::getTitle, title)
+                .gt(PopularizeActivity::getStartTime, now)
+                .eq(PopularizeActivity::getState, "1")
+                .set(PopularizeActivity::getType, "1")
+                .set(PopularizeActivity::getState, 0)
+                .update();
+
+
+        Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeActivity> page1 = popularizeActivityService
+                .lambdaQuery()
+                .like(title!= null, PopularizeActivity::getTitle, title)
+                .eq(StringUtils.isNotBlank(cityId), PopularizeActivity::getCityId,cityId)
+//                .eq(PopularizeActivity::getState, state)
+                .gt("0".equals(state), PopularizeActivity::getStartTime, now)
+                .lt(!"0".equals(state), PopularizeActivity::getStartTime, now)
+                .like(StringUtils.isNotBlank(timeStr), PopularizeActivity::getStartTime, timeStr)
+                .orderBy(true, "0".equals(state), PopularizeActivity::getStartTime)
+                .page(page);
+
+        for (PopularizeActivity recruit : page1.getRecords()) {
+            //创建一个对象
+            recruit.setPopularizeOrderList(
+                    popularizeOrderService
+                            .lambdaQuery()
+                            .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
+                            .ge(PopularizeOrder::getState, 1)
+                            .list()
+            );
+            //查询订单购票数量之和
+            Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());
+            if(i==null){
+                i = 0;
+            }
+            i = i.intValue() + recruit.getOrderNum().intValue();
+            recruit.setNum(i);
+        }
+
+        return Result.OK(page1);
+    }
+
+
+    /*
+
     //获取首页活动列表带分页
     @Override
     public Result<?> getActivityPageList(String title, String state,String timeStr,String cityId, PageBean pageBean){
@@ -165,26 +227,11 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .lambdaQuery()
                     .like(title!= null, PopularizeActivity::getTitle, title)
                     .eq(PopularizeActivity::getState,state)
+                    .like(StringUtils.isNotBlank(timeStr), PopularizeActivity::getStartTime, timeStr)
                     .orderByDesc(PopularizeActivity::getCreateTime)
                     .page(page);
-            //如果标题不为空
-            if(StringUtils.isNotBlank(title)){
-                page1 = popularizeActivityService
-                        .lambdaQuery()
-                        .like(title!= null, PopularizeActivity::getTitle, title)
-                        .eq(PopularizeActivity::getState,state)
-                        .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
@@ -238,7 +285,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .lambdaQuery()
                     .eq(PopularizeActivity::getState,state)
                     .like(title!= null, PopularizeActivity::getTitle, title)
-                    .orderByAsc(PopularizeActivity::getCreateTime)
+                    .orderByAsc(PopularizeActivity::getStartTime)
                     .page(page);
             //如果标题不为空
             if(StringUtils.isNotBlank(title)){
@@ -246,7 +293,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                         .lambdaQuery()
                         .like(title!= null, PopularizeActivity::getTitle, title)
                         .eq(PopularizeActivity::getState,state)
-                        .orderByAsc(PopularizeActivity::getCreateTime)
+                        .orderByAsc(PopularizeActivity::getStartTime)
                         .page(page);
             }
             //如果时间不为空
@@ -255,7 +302,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                         .lambdaQuery()
                         .like(PopularizeActivity::getStartTime,timeStr)
                         .eq(PopularizeActivity::getState,state)
-                        .orderByAsc(PopularizeActivity::getCreateTime)
+                        .orderByAsc(PopularizeActivity::getStartTime)
                         .page(page);
             }
             //如果地址不为空
@@ -265,7 +312,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                         .like(title!= null, PopularizeActivity::getTitle, title)
                         .eq(PopularizeActivity::getCityId,cityId)
                         .eq(PopularizeActivity::getState,state)
-                        .orderByAsc(PopularizeActivity::getCreateTime)
+                        .orderByAsc(PopularizeActivity::getStartTime)
                         .page(page);
                 if(StringUtils.isNotBlank(title)){
                     page1 = popularizeActivityService
@@ -273,7 +320,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                             .eq(PopularizeActivity::getCityId,cityId)
                             .like(title!= null, PopularizeActivity::getTitle, title)
                             .eq(PopularizeActivity::getState,state)
-                            .orderByAsc(PopularizeActivity::getCreateTime)
+                            .orderByAsc(PopularizeActivity::getStartTime)
                             .page(page);
                 }
             }
@@ -308,14 +355,11 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         }
 
 
-
-
-
-
-
     }
 
 
+     */
+
 
     @Override
     public Result<?> getActivityInfo(String token,String activityId){
@@ -576,18 +620,27 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .lambdaQuery()
                 .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
                 //状态不等于0
+                .eq(StringUtils.isNotBlank(state), PopularizeOrder::getState, state)
                 .ne(PopularizeOrder::getState,0)
                 .orderByDesc(PopularizeOrder::getCreateTime)
                 .page(page);
-        if(StringUtils.isNotBlank(state)){
-            page1 = popularizeOrderService
-                    .lambdaQuery()
-                    .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
-                    .eq(PopularizeOrder::getState,state)
-                    .ne(PopularizeOrder::getState,0)
-                    .orderByDesc(PopularizeOrder::getCreateTime)
-                    .page(page);
-        }
+//        if(StringUtils.isNotBlank(state)){
+//            page1 = popularizeOrderService
+//                    .lambdaQuery()
+//                    .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
+//                    .ne(PopularizeOrder::getState,0)
+//                    .orderByDesc(PopularizeOrder::getCreateTime)
+//                    .page(page);
+//        }
+
+        page1.getRecords().forEach(order -> {
+            if ("0".equals(order.getType())) {
+                order.setActivity(popularizeActivityService.getById(order.getActivityOrderId()));
+            }else {
+                order.setTravel(popularizeTravelService.getById(order.getTravelOrderId()));
+            }
+        });
+
         return Result.OK(page1);
     }
 

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

@@ -143,7 +143,7 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 			recruit.setNum(0);
 			recruit.setStateOn(0);
 			recruit.setType("0");
-			recruit.setTravelId(popularizeActivity.getId());
+			recruit.setActivityId(popularizeActivity.getId());
 			popularizeRecruitService.save(recruit);
 		}
 

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

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.api.service.WxMiniappPayService;
 import org.jeecg.api.wxUtils.RefundOrderReq;
@@ -59,14 +61,26 @@ public class PopularizeOrderController extends JeecgController<PopularizeOrder,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<PopularizeOrder> queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap());
-		if(StringUtils.isNotBlank(popularizeOrder.getTitle())){
-			queryWrapper.like("title", popularizeOrder.getTitle());
-		}
 
+//     QueryWrapper<PopularizeOrder> queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap());
+
+		LambdaQueryWrapper<PopularizeOrder> qw = Wrappers.<PopularizeOrder>lambdaQuery();
+
+//     if(StringUtils.isNotBlank(popularizeOrder.getTitle())){
+//        queryWrapper.like("title", popularizeOrder.getTitle());
+//     }
+
+		qw.like(StringUtils.isNotBlank(popularizeOrder.getTitle()), PopularizeOrder::getTitle, popularizeOrder.getTitle());
+		qw.eq(StringUtils.isNotBlank(popularizeOrder.getType()), PopularizeOrder::getType, popularizeOrder.getType());
+
+//     column  createTime  open  userId  address
+		qw.eq(StringUtils.isNotBlank(popularizeOrder.getState()), PopularizeOrder::getState, popularizeOrder.getState());
+		qw.eq(StringUtils.isNotBlank(popularizeOrder.getOpen()), PopularizeOrder::getOpen, popularizeOrder.getOpen());
+		qw.eq(StringUtils.isNotBlank(popularizeOrder.getUserId()), PopularizeOrder::getUserId, popularizeOrder.getUserId());
+		qw.like(StringUtils.isNotBlank(popularizeOrder.getAddress()), PopularizeOrder::getAddress, popularizeOrder.getAddress());
 
 		Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageNo, pageSize);
-		IPage<PopularizeOrder> pageList = popularizeOrderService.page(page, queryWrapper);
+		IPage<PopularizeOrder> pageList = popularizeOrderService.page(page, qw);
 		return Result.OK(pageList);
 	}
 	

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
+import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
@@ -157,4 +159,9 @@ public class PopularizeOrder implements Serializable {
     @ApiModelProperty(value = "性别")
     private java.lang.String userSex;
 
+    @TableField(exist = false)
+    private PopularizeActivity activity;
+
+    @TableField(exist = false)
+    private PopularizeTravel travel;
 }

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

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -110,13 +112,13 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
 					.eq(PopularizeRecruitLog::getRecruitId, popularizeRecruitLog.getRecruitId())
 					.eq(PopularizeRecruitLog::getState, 2)
 					.one();
+
 			if(one!=null){
 				return Result.error("该活动已经有人审核通过，不能重复审核");
-			}else{
-				popularizeRecruitLogService.updateById(popularizeRecruitLog);
 			}
-		}else{
+
 			popularizeRecruitLogService.updateById(popularizeRecruitLog);
+
 			//根据招募项目查询招募信息
 			PopularizeRecruit byId = popularizeRecruitService.getById(popularizeRecruitLog.getRecruitId());
 			//如果为空
@@ -124,16 +126,20 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
 				return Result.error("该招募项目不存在");
 			}
 			//如果招募类型为活动
-			if("1".equals(byId.getType())){
+			if("0".equals(byId.getType())){
 				//设置该主理人为该活动的主理人
-				PopularizeActivity one = popularizeActivityService
+				PopularizeActivity activity = popularizeActivityService
 						.lambdaQuery()
 						.eq(PopularizeActivity::getId, byId.getActivityId())
 						.one();
-				one.setAdminUser(popularizeRecruitLog.getUserId());
-				popularizeActivityService.updateById(one);
-			}
 
+				if (ObjectUtils.isNotEmpty(activity)){
+					activity.setAdminUser(popularizeRecruitLog.getUserId());
+					popularizeActivityService.updateById(activity);
+				}
+			}
+		}else{
+			popularizeRecruitLogService.updateById(popularizeRecruitLog);
 		}
 		return Result.OK("编辑成功!");
 	}

module-system/.gitignore

@@ -1 +1 @@
-/target/
+target

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

@@ -368,7 +368,8 @@ wx:
     appid: wx797abcfb479c75ec # 微信小程序appid
     secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
     merchantId: 1659066870 # 商户号
-    privateKeyPath: /root/api/pem/apiclient_key.pem
+    privateKeyPath: E:\\file\\2025\\1\\popularize-admin\\module-system\\src\main\\resources\\apiclient_key.pem
+#    privateKeyPath: /root/api/pem/apiclient_key.pem
     merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F  # 商户API证书序列号
     apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
     payNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）