From 2bdee6dc3174dbce8b5f3b3c954c88ae8297754f Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Mon, 16 Jun 2025 14:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-pc/.env.development | 2 +- admin-pc/.env.production | 2 +- admin-pc/public/index.html | 2 +- admin-pc/src/views/dashboard/Analysis.vue | 77 +++++------ .../popularizeActivity/PopularizeActivityList.vue | 12 +- .../views/popularizeOrder/PopularizeOrderList.vue | 25 ++-- .../api/controller/AppletMyInfoController.java | 25 ++++ .../org/jeecg/api/service/AppletLoginService.java | 3 + .../api/service/impl/ApiIndexServiceImpl.java | 153 +++++++++++++++++---- .../api/service/impl/AppletLoginServiceImpl.java | 2 +- .../controller/PopularizeOrderController.java | 6 + .../controller/PopularizeRecruitLogController.java | 24 +++- .../controller/SysAnnouncementController.java | 106 ++++++++++++-- .../src/main/resources/application-dev.yml | 33 +++-- 14 files changed, 356 insertions(+), 116 deletions(-) diff --git a/admin-pc/.env.development b/admin-pc/.env.development index cd69ba2..3fe47d3 100644 --- a/admin-pc/.env.development +++ b/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=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/admin-pc/.env.production b/admin-pc/.env.production index df1d7d5..13172c7 100644 --- a/admin-pc/.env.production +++ b/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=https://popularize-admin.hhlm1688.com/popularize-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-pc/public/index.html b/admin-pc/public/index.html index a7a61c1..cfd862b 100644 --- a/admin-pc/public/index.html +++ b/admin-pc/public/index.html @@ -249,7 +249,7 @@
-
正在加载 陌美人后台管理系统,请耐心等待 +
正在加载 VTribe后台管理系统,请耐心等待
diff --git a/admin-pc/src/views/dashboard/Analysis.vue b/admin-pc/src/views/dashboard/Analysis.vue index 7eaf406..083c6cc 100644 --- a/admin-pc/src/views/dashboard/Analysis.vue +++ b/admin-pc/src/views/dashboard/Analysis.vue @@ -80,18 +80,9 @@ - -
- - - - - - - - - - + + + @@ -101,13 +92,13 @@ - - - - - - - + + + + + + + @@ -122,39 +113,39 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + -
- + + diff --git a/admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue b/admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue index 39f43eb..c59fb9a 100644 --- a/admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue +++ b/admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue @@ -298,12 +298,12 @@ align:"center", dataIndex: 'latitude' }, - { - title:'活动需知', - align:"center", - dataIndex: 'orderDetails', - scopedSlots: {customRender: 'htmlSlot'} - }, + // { + // title:'活动需知', + // align:"center", + // dataIndex: 'orderDetails', + // scopedSlots: {customRender: 'htmlSlot'} + // }, { title:'活动城市', align:"center", diff --git a/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue b/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue index 6f2bd7b..30a6747 100644 --- a/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue +++ b/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue @@ -183,10 +183,20 @@ dataIndex: 'state_dictText' }, { - title:'订单标题', + title:'订单【下单标题】', align:"center", dataIndex: 'title' }, + { + title:'【现】活动标题', + align:"center", + dataIndex: 'activityOrderId_dictText' + }, + { + title:'【现】旅行标题', + align:"center", + dataIndex: 'travelOrderId_dictText' + }, { title:'订单图片', align:"center", @@ -218,16 +228,7 @@ align:"center", dataIndex: 'open_dictText' }, - { - title:'溯源活动', - align:"center", - dataIndex: 'activityOrderId_dictText' - }, - { - title:'溯源旅行', - align:"center", - dataIndex: 'travelOrderId_dictText' - }, + { title:'用户标识', align:"center", @@ -236,7 +237,7 @@ { title:'性别', align:"center", - dataIndex: 'user_sex' + dataIndex: 'userSex' }, { title:'支付金额', diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java index de74c34..c9b16f8 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java @@ -3,6 +3,7 @@ package org.jeecg.api.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecg.api.bean.PageBean; import org.jeecg.api.service.ApiIndexService; import org.jeecg.common.api.vo.Result; @@ -46,6 +47,30 @@ public class AppletMyInfoController { String details ){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //昵称必填 + if(StringUtils.isBlank(nickName)){ + return Result.error("昵称不能为空"); + } + if(StringUtils.isBlank(headImage)){ + return Result.error("头像不能为空"); + } + if(StringUtils.isBlank(phone)){ + return Result.error("手机号不能为空"); + } +// if(StringUtils.isBlank(email)){ +// return Result.error("邮箱不能为空"); +// } +// if(StringUtils.isBlank(sex)){ +// return Result.error("性别不能为空"); +// } +// if(StringUtils.isBlank(city)){ +// return Result.error("城市不能为空"); +// } +// if(StringUtils.isBlank(yearDate)){ +// return Result.error("出生日期不能为空"); +// } + + hanHaiMember.setNickName(nickName); hanHaiMember.setHeadImage(headImage); hanHaiMember.setPhone(phone); diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java index 092c7e3..a915e10 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java @@ -24,4 +24,7 @@ public interface AppletLoginService { * @return */ Result bindPhone(String code); + + + } 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 5bbd2d3..2c12ac4 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 @@ -116,7 +116,11 @@ public class ApiIndexServiceImpl implements ApiIndexService { //获取首页地区 @Override public Result getArea(){ - List list = popularizeCityService.list(); + List list = popularizeCityService + //增加倒序 + .lambdaQuery() + .orderByDesc(PopularizeCity::getSort) + .list(); return Result.OK(list); } @@ -145,6 +149,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { List activityList = popularizeActivityService .lambdaQuery() + .like(title!= null, PopularizeActivity::getTitle, title) .lt(PopularizeActivity::getStartTime, LocalDateTime.now()) .list(); // 这是一个假设的方法名，您需要根据实际情况调整 @@ -158,6 +163,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = popularizeActivityService .lambdaQuery() + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getState,state) .orderByDesc(PopularizeActivity::getCreateTime) .page(page); @@ -165,7 +171,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { if(StringUtils.isNotBlank(title)){ page1 = popularizeActivityService .lambdaQuery() - .like(PopularizeActivity::getTitle,title) + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getState,state) .orderByDesc(PopularizeActivity::getCreateTime) .page(page); @@ -183,6 +189,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { if(StringUtils.isNotBlank(cityId)){ page1 = popularizeActivityService .lambdaQuery() + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getCityId,cityId) .eq(PopularizeActivity::getState,state) .orderByDesc(PopularizeActivity::getCreateTime) @@ -191,7 +198,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { page1 = popularizeActivityService .lambdaQuery() .eq(PopularizeActivity::getCityId,cityId) - .like(PopularizeActivity::getTitle,title) + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getState,state) .orderByDesc(PopularizeActivity::getCreateTime) .page(page); @@ -230,13 +237,14 @@ public class ApiIndexServiceImpl implements ApiIndexService { Page page1 = popularizeActivityService .lambdaQuery() .eq(PopularizeActivity::getState,state) + .like(title!= null, PopularizeActivity::getTitle, title) .orderByAsc(PopularizeActivity::getCreateTime) .page(page); //如果标题不为空 if(StringUtils.isNotBlank(title)){ page1 = popularizeActivityService .lambdaQuery() - .like(PopularizeActivity::getTitle,title) + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getState,state) .orderByAsc(PopularizeActivity::getCreateTime) .page(page); @@ -254,6 +262,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { if(StringUtils.isNotBlank(cityId)){ page1 = popularizeActivityService .lambdaQuery() + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getCityId,cityId) .eq(PopularizeActivity::getState,state) .orderByAsc(PopularizeActivity::getCreateTime) @@ -262,7 +271,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { page1 = popularizeActivityService .lambdaQuery() .eq(PopularizeActivity::getCityId,cityId) - .like(PopularizeActivity::getTitle,title) + .like(title!= null, PopularizeActivity::getTitle, title) .eq(PopularizeActivity::getState,state) .orderByAsc(PopularizeActivity::getCreateTime) .page(page); @@ -367,7 +376,10 @@ public class ApiIndexServiceImpl implements ApiIndexService { List activityList = popularizeTravelService .lambdaQuery() + .like(title!= null, PopularizeTravel::getTitle, title) .lt(PopularizeTravel::getStartTime, LocalDateTime.now()) + .orderByDesc(PopularizeTravel::getCreateTime) + .eq(PopularizeTravel::getIsOpen, "Y") .list(); // 这是一个假设的方法名，您需要根据实际情况调整 for (PopularizeTravel activity : activityList) { @@ -382,6 +394,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = popularizeTravelService .lambdaQuery() + .like(title!= null, PopularizeTravel::getTitle, title) .eq(PopularizeTravel::getIsOpen,"Y") .orderByDesc(PopularizeTravel::getCreateTime) .page(page); @@ -389,7 +402,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { if(StringUtils.isNotBlank(title)){ page1 = popularizeTravelService .lambdaQuery() - .like(PopularizeTravel::getTitle,title) + .like(title!= null, PopularizeTravel::getTitle, title) .eq(PopularizeTravel::getState,state) .eq(PopularizeTravel::getIsOpen,"Y") .orderByDesc(PopularizeTravel::getCreateTime) @@ -399,6 +412,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { if(StringUtils.isNotBlank(timeStr)){ page1 = popularizeTravelService .lambdaQuery() + .like(title!= null, PopularizeTravel::getTitle, title) .like(PopularizeTravel::getStartTime,timeStr) .eq(PopularizeTravel::getState,state) .eq(PopularizeTravel::getIsOpen,"Y") @@ -410,13 +424,14 @@ public class ApiIndexServiceImpl implements ApiIndexService { page1 = popularizeTravelService .lambdaQuery() .eq(PopularizeTravel::getState,state) + .eq(PopularizeTravel::getIsOpen, "Y") .orderByDesc(PopularizeTravel::getCreateTime) .page(page); //如果标题不为空 if(StringUtils.isNotBlank(title)){ page1 = popularizeTravelService .lambdaQuery() - .like(PopularizeTravel::getTitle,title) + .like(title!= null, PopularizeTravel::getTitle, title) .eq(PopularizeTravel::getState,state) .eq(PopularizeTravel::getIsOpen,"Y") .orderByDesc(PopularizeTravel::getCreateTime) @@ -669,6 +684,79 @@ public class ApiIndexServiceImpl implements ApiIndexService { @Override public Result cancelOrder(String token, String orderId) { +// // 常量定义（提高可读性） +// final long ONE_DAY_MS = 1000 * 60 * 60 * 24; +// final long SEVEN_DAYS_MS = ONE_DAY_MS * 7; +// +// HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); +// PopularizeOrder order = popularizeOrderService.getById(orderId); +// +// // 安全校验（建议添加） +// if (order == null || order.getStartTime() == null) { +// return Result.error("订单不存在或未支付"); +// } +// +// long currentTime = System.currentTimeMillis(); +// long payTime = order.getStartTime().getTime(); +// +// // 时间差计算 +// long timeDiff = currentTime - payTime; +// +// String msg; +// BigDecimal refundAmount = BigDecimal.ZERO; +// +// // 优化后的时间判断逻辑（从大到小判断） +// if (timeDiff > SEVEN_DAYS_MS) { +// // 超过7天（退100%） +// refundAmount = order.getPayPrice(); +// msg = "取消成功，超过7天全额退款"; +// } else if (timeDiff > ONE_DAY_MS) { +// // 1-7天之间（退50%） +// refundAmount = order.getPayPrice().divide(new BigDecimal(2), 2, RoundingMode.HALF_UP); +// msg = "取消成功，1-7天内退50%"; +// } else { +// // 24小时内（不可退款） +// msg = "24小时内不可取消订单"; +// return Result.error(msg); // 直接返回错误 +// } +// +// //创建退款记录订单 +// PopularizeOrderTuiLog tuiLog = new PopularizeOrderTuiLog(); +// tuiLog.setCreateTime(new Date()); +// tuiLog.setOrderId(order.getId()); +// tuiLog.setOrderPrice(order.getPayPrice()); +// tuiLog.setTuiPrice(refundAmount); +// tuiLog.setUserId(member.getId()); +// tuiLog.setState(0); +// popularizeOrderTuiLogService.save(tuiLog); +// +// +// // 执行退款操作 +// RefundOrderReq req = new RefundOrderReq(); +// req.setOutTradeNo(order.getOutTradeNo()); +// req.setRefundAmount(refundAmount); +// req.setTotalAmount(order.getPayPrice()); +// req.setTransactionId(order.getTransactionId()); +// +// // 添加退款结果校验（建议） +// wxMiniappPayService.refund(req); +// +// +// // 更新订单状态（建议添加） +// order.setState("3"); // 假设3表示已取消 +// popularizeOrderService.updateById(order); +// +// return Result.OK(msg); + + + + + + + + + + // 常量定义（提高可读性） final long ONE_DAY_MS = 1000 * 60 * 60 * 24; final long SEVEN_DAYS_MS = ONE_DAY_MS * 7; @@ -682,30 +770,34 @@ public class ApiIndexServiceImpl implements ApiIndexService { } long currentTime = System.currentTimeMillis(); - long payTime = order.getStartTime().getTime(); + long activityTime = order.getStartTime().getTime(); - // 时间差计算 - long timeDiff = currentTime - payTime; + // 时间差计算（计算剩余时间） + long timeDiff = activityTime - currentTime; String msg; BigDecimal refundAmount = BigDecimal.ZERO; - // 优化后的时间判断逻辑（从大到小判断） + // 修正后的时间判断逻辑 if (timeDiff > SEVEN_DAYS_MS) { - // 超过7天（退100%） + // 活动开始前7天以上（退100%） refundAmount = order.getPayPrice(); - msg = "取消成功，超过7天全额退款"; + msg = "取消成功，活动开始前7天以上全额退款"; } else if (timeDiff > ONE_DAY_MS) { - // 1-7天之间（退50%） + // 活动开始前1-7天（退50%） refundAmount = order.getPayPrice().divide(new BigDecimal(2), 2, RoundingMode.HALF_UP); - msg = "取消成功，1-7天内退50%"; - } else { - // 24小时内（不可退款） + msg = "取消成功，活动开始前1-7天退50%"; + } else if (timeDiff > 0) { + // 活动开始前24小时内（退0%） msg = "24小时内不可取消订单"; - return Result.error(msg); // 直接返回错误 + return Result.error(msg); + } else { + // 活动已开始（可根据业务需求处理） + msg = "活动已开始，不可取消订单"; + return Result.error(msg); } - //创建退款记录订单 + // 创建退款记录订单 PopularizeOrderTuiLog tuiLog = new PopularizeOrderTuiLog(); tuiLog.setCreateTime(new Date()); tuiLog.setOrderId(order.getId()); @@ -715,7 +807,6 @@ public class ApiIndexServiceImpl implements ApiIndexService { tuiLog.setState(0); popularizeOrderTuiLogService.save(tuiLog); - // 执行退款操作 RefundOrderReq req = new RefundOrderReq(); req.setOutTradeNo(order.getOutTradeNo()); @@ -726,7 +817,6 @@ public class ApiIndexServiceImpl implements ApiIndexService { // 添加退款结果校验（建议） wxMiniappPayService.refund(req); - // 更新订单状态（建议添加） order.setState("3"); // 假设3表示已取消 popularizeOrderService.updateById(order); @@ -1118,8 +1208,11 @@ public class ApiIndexServiceImpl implements ApiIndexService { // .eq(PopularizeOrder::getOpen, "Y") // .list().size() // ); - recruitObj.setDoNum(popularizeOrderService.sumNumByTravelOrderIdAndStateQD(recruit.getId())); - + Integer i = popularizeOrderService.sumNumByTravelOrderIdAndStateQD(recruit.getId()); + if (i==0){ + recruitObj.setDoNum(0); + } + recruitObj.setDoNum(i); @@ -1187,7 +1280,8 @@ public class ApiIndexServiceImpl implements ApiIndexService { popularizeOrderService .lambdaQuery() .eq(PopularizeOrder::getActivityOrderId, recruit.getId()) - .ge(PopularizeOrder::getState, 1) + .eq(PopularizeOrder::getState,1) + .eq(PopularizeOrder::getType, 0) .list() ); recruitObj.setNum(recruitObj.getPopularizeOrderList().size()); @@ -1201,7 +1295,13 @@ public class ApiIndexServiceImpl implements ApiIndexService { // .list().size() // ); - recruitObj.setDoNum(popularizeOrderService.sumNumByActivityOrderIdAndStateQD(recruit.getId())); + + Integer i = popularizeOrderService.sumNumByActivityOrderIdAndStateQD(recruit.getId()); + if (i==null){ + recruitObj.setDoNum(0); + } + recruitObj.setDoNum(i); + recruitList.add(recruitObj); @@ -1220,6 +1320,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { Page page = popularizeOrderService .lambdaQuery() .orderByDesc(PopularizeOrder::getCreateTime) + .eq(PopularizeOrder::getState,1) .page(new Page<>(pageBean.getPageNo(), pageBean.getPageSize())); //type==0判断活动是否存在 if(type==0){ @@ -1231,6 +1332,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { .lambdaQuery() .eq(PopularizeOrder::getActivityOrderId, recruitId) .orderByDesc(PopularizeOrder::getCreateTime) + .eq(PopularizeOrder::getState,1) .eq(PopularizeOrder::getType, 0) .page(new Page<>(pageBean.getPageNo(), pageBean.getPageSize())); } @@ -1243,6 +1345,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { .lambdaQuery() .eq(PopularizeOrder::getTravelOrderId, recruitId) .eq(PopularizeOrder::getType, 1) + .eq(PopularizeOrder::getState,1) .orderByDesc(PopularizeOrder::getCreateTime) .page(new Page<>(pageBean.getPageNo(), pageBean.getPageSize())); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 185b9d7..4932f10 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -81,7 +81,7 @@ public class AppletLoginServiceImpl implements AppletLoginService { member = new HanHaiMember(); // member.setSesssionKey(sessionKey); member.setAppletOpenid(wxOpenid); - member.setNickName("VTribe"+System.currentTimeMillis()); + member.setNickName(null); member.setHeadImage(loginReq.getHeadimgurl()); // 生成token返回给小程序端 String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java index 1c41b01..0bb2d35 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java @@ -5,6 +5,7 @@ import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.jeecg.api.service.WxMiniappPayService; import org.jeecg.api.wxUtils.RefundOrderReq; import org.jeecg.common.api.vo.Result; @@ -59,6 +60,11 @@ public class PopularizeOrderController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap()); + if(StringUtils.isNotBlank(popularizeOrder.getTitle())){ + queryWrapper.like("title", popularizeOrder.getTitle()); + } + + Page page = new Page(pageNo, pageSize); IPage pageList = popularizeOrderService.page(page, queryWrapper); return Result.OK(pageList); 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 66dc83a..28261a3 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 @@ -14,6 +14,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity; import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService; +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; @@ -51,7 +53,10 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class PopularizeRecruitLogController extends JeecgController { @Autowired private IPopularizeRecruitLogService popularizeRecruitLogService; - private IPopularizeActivityService popularizeActivityService; + @Autowired + private IPopularizeActivityService popularizeActivityService; + @Autowired + private IPopularizeRecruitService popularizeRecruitService; /** * 分页列表查询 @@ -112,6 +117,23 @@ public class PopularizeRecruitLogController extends JeecgController