From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 148 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 132 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 26ea2c3..1ec67ed 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -4,25 +4,36 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.UserPointClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.Share;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.enums.ShareAuditStatus;
+import com.ruoyi.other.service.PointSettingService;
import com.ruoyi.other.service.ShareService;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -46,6 +57,10 @@
private ShopClient shopClient;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private UserPointClient userPointClient;
+ @Resource
+ private PointSettingService pointSettingService;
@@ -58,8 +73,12 @@
})
@GetMapping("/list")
public R<List<Share>> list(@RequestParam Integer objectId) {
- return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
- .eq(Share::getObjectId, objectId)));
+ List<Share> list = shareService.list(new LambdaQueryWrapper<Share>()
+ .eq(Share::getObjectId, objectId)
+ .eq(Share::getDelFlag, 0).or()
+ .eq(Share::getAddType, 1)
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime));
+ return R.ok(list);
}
@@ -68,7 +87,8 @@
public R<List<Share>> recommandlist() {
Long userid = tokenService.getLoginUserApplet().getUserid();
return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType, 2)
- .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0)));
+ .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1)
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime)));
}
@@ -83,10 +103,10 @@
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
} else if (share.getAddType() == 2) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- share.setObjectId(userid.toString());
+ share.setObjectId(userid);
}
share.setDelFlag(0);
- share.setAppletShare(1);
+ share.setCreateTime(LocalDateTime.now());
shareService.save(share);
return R.ok();
}
@@ -130,11 +150,14 @@
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
share.setAddType(sysUser.getRoleType() == 1 ? 1 : 3);
share.setAppletShare(0);
- share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
if(sysUser.getRoleType() == 2){
- share.setObjectId(sysUser.getObjectId().toString());
+ share.setObjectId(sysUser.getObjectId().longValue());
}
- share.setAuditStatus(0);
+ if (sysUser.getRoleType() == 1){
+ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+ }else{
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ }
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -143,6 +166,9 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
+ if (null == share.getAuditStatus() || share.getAuditStatus()==2){
+ share.setAuditStatus(0);
+ }
shareService.updateById(share);
return R.ok();
}
@@ -156,16 +182,27 @@
@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
@GetMapping("/manage/list")
- public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
+ public R<Page<Share>> managelist(String name,
+ Integer addType,
+ Integer auditStatus,
+ @RequestParam Integer pageNum, Integer pageSize) {
//判断当前登陆人是平台还是门店
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
if (sysUser.getRoleType()==1) {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name)
- .eq(Share::getAddType, 1).page(Page.of(pageNum, pageSize));
+ Page<Share> page = shareService.lambdaQuery()
+ .eq(Share::getAuditStatus, 1)
+ .eq(Share::getDelFlag, 0)
+ .like(name != null, Share::getName, name)
+ .eq(addType != null , Share::getAddType, addType)
+ .page(Page.of(pageNum, pageSize));
return R.ok(page);
}else {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, sysUser.getObjectId())
+ Page<Share> page = shareService.lambdaQuery()
+ .eq(auditStatus!= null, Share::getAuditStatus, auditStatus)
+ .eq(Share::getAddType,3)
+ .eq(Share::getDelFlag, 0)
+ .eq(Share::getObjectId, sysUser.getObjectId())
.like(name != null, Share::getName, name).page(Page.of(pageNum, pageSize));
return R.ok(page);
}
@@ -192,8 +229,45 @@
@ApiOperation(value = "广告管理-分享管理-审核列表", tags = {"管理后台"})
@GetMapping("/manage/auth/list")
- public R<Page<Share>> authmanagelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
- Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).orderByAsc(Share::getAuditStatus).page(Page.of(pageNum, pageSize));
+ public R<Page<Share>> authmanagelist(String name,
+ Integer addType,
+ String authName,
+ String authPhone,
+ Integer auditStatus,
+ @RequestParam Integer pageNum,
+ Integer pageSize) {
+
+ List<Integer> shopIds = new ArrayList<>();
+ List<Long> userIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(authName)){
+ R<List<AppUser>> uR = appUserClient.getAppUserByName(authName);
+ List<AppUser> userList = uR.getData();
+ if (CollectionUtils.isEmpty(userList)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
+ //门店名称
+ Set<Integer> integers = shopClient.getShopIdByName(authName).getData();
+ if(null != integers){
+ shopIds.addAll(integers);
+ }
+ }
+ if (StringUtils.isNotEmpty(authPhone)){
+ R<List<AppUser>> uR = appUserClient.getAppUserByPhone(authPhone);
+ List<AppUser> userList = uR.getData();
+ if (CollectionUtils.isEmpty(userList)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
+ //获取门店
+ for (AppUser appUser : userList) {
+ List<Shop> data = shopClient.getShopByUserId(appUser.getId()).getData();
+ if(null != data && data.size() > 0){
+ shopIds.addAll(data.stream().map(Shop::getId).collect(Collectors.toList()));
+ }
+ }
+ }
+ Page<Share> page = shareService.authmanagelist(name, addType, auditStatus, userIds, shopIds, pageNum, pageSize);
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
@@ -203,7 +277,7 @@
}
}
if (record.getAddType() == 3) {
- R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
+ R<Shop> shopById = shopClient.getShopById(record.getObjectId().intValue());
if (shopById.getData() != null) {
record.setAuthName(shopById.getData().getName());
}
@@ -233,9 +307,51 @@
@ApiOperation(value = "获取小程序分享数据", tags = {"小程序-分享"})
@GetMapping("/auth/getAppletShare")
public R<Share> getAppletShare(){
- Share one = shareService.getOne(new LambdaQueryWrapper<Share>().eq(Share::getDelFlag, 0).eq(Share::getAppletShare, 1).eq(Share::getAuditStatus, 1).last(" limit 0, 1"));
+ Share one = shareService.getOne(new LambdaQueryWrapper<Share>().eq(Share::getDelFlag, 0).eq(Share::getAppletShare, 1)
+ .eq(Share::getAuditStatus, 1).last(" limit 0, 1"));
+ //添加每日分享积分
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ if(StringUtils.isNotEmpty(token)){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ Boolean data = userPointClient.judgmentDailyShare(userid).getData();
+ if(!data){
+ AppUser appUser = appUserClient.getAppUserById(userid);
+ PointSetting pointSetting = pointSettingService.getOne(new LambdaQueryWrapper<PointSetting>()
+ .eq(PointSetting::getId, appUser.getVipId()).eq(PointSetting::getDelFlag, 0));
+ if(null != pointSetting){
+ Integer everySharePoint = pointSetting.getEverySharePoint();
+ if(everySharePoint > 0){
+ Integer lavePoint = appUser.getLavePoint();
+ appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint);
+ appUser.setLavePoint(appUser.getLavePoint() + everySharePoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() + everySharePoint);
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + everySharePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + everySharePoint);
+ appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
+ appUserClient.editAppUserById(appUser);
+ //添加积分流水
+ UserPoint userPoint = new UserPoint();
+ userPoint.setAppUserId(userid);
+ userPoint.setType(4);
+ userPoint.setVariablePoint(everySharePoint);
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setChangeDirection(1);
+ userPointClient.saveUserPoint(userPoint);
+ }
+ }
+
+ }
+ }
return R.ok(one);
}
+
+ //appUserShare/
+ @GetMapping("/saveAppUserShare")
+ public R<Share> saveAppUserShare() {
+ return getAppletShare();
+ }
+
}
--
Gitblit v1.7.1