Augcl
/
popularize-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

推广代码

master
主管理员 2 days ago
parent
e0e8b0c111
commit
2bdee6dc31
14 changed files with 356 additions and 116 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      admin-pc/.env.development
  2. +1
    -1
      admin-pc/.env.production
  3. +1
    -1
      admin-pc/public/index.html
  4. +34
    -43
      admin-pc/src/views/dashboard/Analysis.vue
  5. +6
    -6
      admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue
  6. +13
    -12
      admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue
  7. +25
    -0
      module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java
  8. +3
    -0
      module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java
  9. +128
    -25
      module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java
  10. +1
    -1
      module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
  11. +6
    -0
      module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java
  12. +23
    -1
      module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java
  13. +98
    -8
      module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
  14. +16
    -17
      module-system/src/main/resources/application-dev.yml

+ 1
- 1
admin-pc/.env.development View File

@ -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


+ 1
- 1
admin-pc/.env.production View File

@ -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

+ 1
- 1
admin-pc/public/index.html View File

@ -249,7 +249,7 @@
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title">正在加载 陌美人后台管理系统,请耐心等待
<div class="load_title">正在加载 VTribe后台管理系统,请耐心等待
</div>
</div>


+ 34
- 43
admin-pc/src/views/dashboard/Analysis.vue View File

@ -80,18 +80,9 @@
<!-- </a-col>-->
</a-row>
<a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
<div class="salesCard">
<a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
<!-- <div class="extra-wrapper" slot="tabBarExtraContent">-->
<!-- <div class="extra-item">-->
<!-- <a>今日</a>-->
<!-- <a>本周</a>-->
<!-- <a>本月</a>-->
<!-- <a>本年</a>-->
<!-- </div>-->
<!-- <a-range-picker :style="{width: '256px'}" />-->
<!-- </div>-->
<!-- <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">-->
<!-- <div class="salesCard">-->
<!-- <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">-->
@ -101,13 +92,13 @@
<a-tab-pane loading="true" tab="注册用户" key="1">
<a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
<index-bar title="新增注册用户数量" />
</a-col>
</a-row>
</a-tab-pane>
<!-- <a-tab-pane loading="true" tab="注册用户" key="1">-->
<!-- <a-row>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="新增注册用户数量" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
@ -122,39 +113,39 @@
<a-tab-pane loading="true" tab="平台营业额" key="2">
<a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
<index-bar title="营业额总数" />
</a-col>
</a-row>
</a-tab-pane>
<!-- <a-tab-pane loading="true" tab="平台营业额" key="2">-->
<!-- <a-row>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="营业额总数" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
<a-tab-pane loading="true" tab="报名用户数" key="3">
<a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
<index-bar title="新增报名用户数" />
</a-col>
</a-row>
</a-tab-pane>
<!-- <a-tab-pane loading="true" tab="报名用户数" key="3">-->
<!-- <a-row>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="新增报名用户数" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
<a-tab-pane loading="true" tab="主理人数量" key="4">
<a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
<index-bar title="新增主理人数量" />
</a-col>
</a-row>
</a-tab-pane>
<!-- <a-tab-pane loading="true" tab="主理人数量" key="4">-->
<!-- <a-row>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="新增主理人数量" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
</a-tabs>
<!-- </a-tabs>-->
</div>
</a-card>
<!-- </div>-->
<!-- </a-card>-->
</div>


+ 6
- 6
admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue View File

@ -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",


+ 13
- 12
admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue View File

@ -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:'支付金额',


+ 25
- 0
module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java View File

@ -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);


+ 3
- 0
module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java View File

@ -24,4 +24,7 @@ public interface AppletLoginService {
* @return
*/
Result<Object> bindPhone(String code);
}

+ 128
- 25
module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java View File

@ -116,7 +116,11 @@ public class ApiIndexServiceImpl implements ApiIndexService {
//获取首页地区
@Override
public Result<?> getArea(){
List<PopularizeCity> list = popularizeCityService.list();
List<PopularizeCity> list = popularizeCityService
//增加倒序
.lambdaQuery()
.orderByDesc(PopularizeCity::getSort)
.list();
return Result.OK(list);
}
@ -145,6 +149,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
List<PopularizeActivity> 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<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
Page<PopularizeActivity> 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<PopularizeActivity> 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<PopularizeTravel> 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<PopularizeTravel> page = new Page<PopularizeTravel>(pageBean.getPageNo(), pageBean.getPageSize());
Page<PopularizeTravel> 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<PopularizeOrder> 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()));
}


+ 1
- 1
module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java View File

@ -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);


+ 6
- 0
module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java View File

@ -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<PopularizeOrder,
@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());
}
Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageNo, pageSize);
IPage<PopularizeOrder> pageList = popularizeOrderService.page(page, queryWrapper);
return Result.OK(pageList);


+ 23
- 1
module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java View File

@ -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<PopularizeRecruitLog, IPopularizeRecruitLogService> {
@Autowired
private IPopularizeRecruitLogService popularizeRecruitLogService;
private IPopularizeActivityService popularizeActivityService;
@Autowired
private IPopularizeActivityService popularizeActivityService;
@Autowired
private IPopularizeRecruitService popularizeRecruitService;
/**
* 分页列表查询
@ -112,6 +117,23 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
}
}else{
popularizeRecruitLogService.updateById(popularizeRecruitLog);
//根据招募项目查询招募信息
PopularizeRecruit byId = popularizeRecruitService.getById(popularizeRecruitLog.getRecruitId());
//如果为空
if(byId==null){
return Result.error("该招募项目不存在");
}
//如果招募类型为活动
if("1".equals(byId.getType())){
//设置该主理人为该活动的主理人
PopularizeActivity one = popularizeActivityService
.lambdaQuery()
.eq(PopularizeActivity::getId, byId.getActivityId())
.one();
one.setAdminUser(popularizeRecruitLog.getUserId());
popularizeActivityService.updateById(one);
}
}
return Result.OK("编辑成功!");
}


+ 98
- 8
module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java View File

@ -16,10 +16,15 @@ import org.jeecg.common.constant.WebsocketConst;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.jeecg.modules.message.websocket.WebSocket;
import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
import org.jeecg.modules.system.entity.SysAnnouncement;
import org.jeecg.modules.system.entity.SysAnnouncementSend;
import org.jeecg.modules.system.service.ISysAnnouncementSendService;
@ -45,6 +50,9 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -79,6 +87,25 @@ public class SysAnnouncementController {
@Lazy
private RedisUtil redisUtil;
//用户信息
@Autowired
private IHanHaiMemberService hanHaiMemberService;
@Autowired
private IPopularizeOrderService popularizeOrderService;
/**
* 分页列表查询
* @param sysAnnouncement
@ -391,8 +418,15 @@ public class SysAnnouncementController {
openIdUserData.put("11", 100);
openIdUserData.put("12", 100);
sysMsgMap.put("openIdUserToday", 1);
sysMsgMap.put("openIdUserTotal", 100);
//查询总用户数
int openIdUserTotal = hanHaiMemberService.list().size();
// 查询今日新增用户数
int openIdUserToday = Math.toIntExact(hanHaiMemberService
.lambdaQuery()
.apply("DATE(create_time) = CURDATE()") // MySQL语法
.count());
sysMsgMap.put("openIdUserToday", openIdUserToday);
sysMsgMap.put("openIdUserTotal",openIdUserTotal);
sysMsgMap.put("openIdUserData", openIdUserData);
@ -411,8 +445,20 @@ public class SysAnnouncementController {
openIdOpenUserData.put("11", 100);
openIdOpenUserData.put("12", 100);
sysMsgMap.put("openIdOpenUserToday", 2);
sysMsgMap.put("openIdOpenUserTotal", 100);
//查询总订单报名人数
long openIdOpenUserTotal = popularizeOrderService
.lambdaQuery()
.count();
//查询今日订单报名人数
long openIdOpenUserToday = Math.toIntExact(popularizeOrderService
.lambdaQuery()
.apply("DATE(create_time) = CURDATE()") // MySQL语法
.count());
sysMsgMap.put("openIdOpenUserToday", openIdOpenUserToday);
sysMsgMap.put("openIdOpenUserTotal", openIdOpenUserTotal);
sysMsgMap.put("openIdOpenUserData", openIdOpenUserData);
@ -431,8 +477,21 @@ public class SysAnnouncementController {
openIdAdminUserData.put("11", 100);
openIdAdminUserData.put("12", 300);
sysMsgMap.put("openIdAdminUserToday", 1);
sysMsgMap.put("openIdAdminUserTotal", 300);
//查询总用户数
int openIdAdminUserTotal = hanHaiMemberService
.lambdaQuery()
.eq(HanHaiMember::getIsUser, "Y")
.list().size();
// 查询今日新增用户数
int openIdAdminUserToday = Math.toIntExact(hanHaiMemberService
.lambdaQuery()
.eq(HanHaiMember::getIsUser, "Y")
.apply("DATE(create_time) = CURDATE()") // MySQL语法
.count());
sysMsgMap.put("openIdAdminUserToday", openIdAdminUserToday);
sysMsgMap.put("openIdAdminUserTotal", openIdAdminUserTotal);
sysMsgMap.put("openIdAdminUserData", openIdAdminUserData);
@ -451,8 +510,31 @@ public class SysAnnouncementController {
openIdMoneyData.put("11", 1000000);
openIdMoneyData.put("12", 10000);
sysMsgMap.put("openIdMoneyUserToday", 100);
sysMsgMap.put("openIdMoneyUserTotal", 10000);
//查询总订单支付成功金额
BigDecimal sumNum = popularizeOrderService.lambdaQuery()
.select(PopularizeOrder::getPayPrice)
.eq(PopularizeOrder::getState, "1")
.list()
.stream()
.map(PopularizeOrder::getPayPrice)
.reduce(BigDecimal.ZERO, BigDecimal::add);
//查询今日订单支付成功金额
BigDecimal sumNumToday = popularizeOrderService.lambdaQuery()
.select(PopularizeOrder::getPayPrice)
.eq(PopularizeOrder::getState, "1")
.ge(PopularizeOrder::getCreateTime, getDayStart())
.le(PopularizeOrder::getCreateTime, getDayEnd())
.list()
.stream()
.map(PopularizeOrder::getPayPrice)
.reduce(BigDecimal.ZERO, BigDecimal::add);
sysMsgMap.put("openIdMoneyUserToday", sumNumToday);
sysMsgMap.put("openIdMoneyUserTotal", sumNum);
sysMsgMap.put("openIdMoneyData", openIdMoneyData);
@ -460,7 +542,15 @@ public class SysAnnouncementController {
result.setResult(sysMsgMap);
return result;
}
public static Date getDayStart() {
LocalDateTime todayStart = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);
return Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
}
public static Date getDayEnd() {
LocalDateTime todayEnd = LocalDateTime.now().withHour(23).withMinute(59).withSecond(59).withNano(999);
return Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant());
}
/**
* 导出excel


+ 16
- 17
module-system/src/main/resources/application-dev.yml View File

@ -349,30 +349,30 @@ wechat-dm:
notifyUrl:
## 微信商户
wx:
miniapp:
appid: wx797abcfb479c75ec # 微信小程序appid
secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
merchantId: 1659066870 # 商户号
privateKeyPath: E:\\git_java\\api_java\\popularize-admin\\popularize-admin\\popularize-admin\\module-pay\\src\\main\\resources\\apiclient_key.pem
merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F # 商户API证书序列号
apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
payNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
refundNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
### 微信商户
#wx:
# miniapp:
# appid: wx797abcfb479c75ec # 微信小程序appid
# secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
# merchantId: 1659066870 # 商户号
# privateKeyPath: /root/api/pem/apiclient_key.pem
# privateKeyPath: E:\\git_java\\api_java\\popularize-admin\\popularize-admin\\popularize-admin\\module-pay\\src\\main\\resources\\apiclient_key.pem
# merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F # 商户API证书序列号
# apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
# payNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
# refundNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
# payNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
# refundNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
## 微信商户
wx:
miniapp:
appid: wx797abcfb479c75ec # 微信小程序appid
secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
merchantId: 1659066870 # 商户号
privateKeyPath: /root/api/pem/apiclient_key.pem
merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F # 商户API证书序列号
apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
payNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
refundNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
#wxpay:
@ -381,7 +381,6 @@ wx:
# #商户号
# mchId: 1684030364
# # APIv2密钥
# apiKey: 0fdb77429ffdf206c151af76a663041c
# # APIv3密钥
# apiV3Key: 0fdb77429ffdf206c151af76a663041c
# # 微信支付V3-url前缀


Write Preview
Loading…
Cancel
Save