diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6833148..4c64059 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/popularize-admin.iml b/.idea/popularize-admin.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/.idea/popularize-admin.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/admin-pc/.env.development b/admin-pc/.env.development
index 3fe47d3..7d35ff9 100644
--- a/admin-pc/.env.development
+++ b/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
diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java
index 2c12ac4..556ac32 100644
--- a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java
+++ b/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 page = new Page(pageBean.getPageNo(), pageBean.getPageSize());
+ Page 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);
}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java
index 1a3ec03..7656ba9 100644
--- a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java
@@ -143,7 +143,7 @@ public class PopularizeActivityController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap());
- if(StringUtils.isNotBlank(popularizeOrder.getTitle())){
- queryWrapper.like("title", popularizeOrder.getTitle());
- }
+// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap());
+
+ LambdaQueryWrapper qw = Wrappers.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 page = new Page(pageNo, pageSize);
- IPage pageList = popularizeOrderService.page(page, queryWrapper);
+ IPage pageList = popularizeOrderService.page(page, qw);
return Result.OK(pageList);
}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java
index e4574b7..a3bef04 100644
--- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java
+++ b/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;
}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java
index 28261a3..241808f 100644
--- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java
+++ b/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