From e4eaabefaaa2ca95f809c47a11712c3bee56e1b5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 20 二月 2025 15:07:09 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 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 8e1cc25..1d124c7 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
@@ -76,7 +76,7 @@
.eq(Share::getObjectId, objectId)
.eq(Share::getDelFlag, 0).or()
.eq(Share::getAddType, 1)
- .eq(Share::getDelFlag, 0));
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime));
return R.ok(list);
}
@@ -86,7 +86,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)));
}
@@ -151,12 +152,11 @@
if(sysUser.getRoleType() == 2){
share.setObjectId(sysUser.getObjectId().longValue());
}
-// if (sysUser.getRoleType() == 1){
-// share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
-// }else{
-// share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
-// }
- share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ if (sysUser.getRoleType() == 1){
+ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+ }else{
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ }
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -255,6 +255,16 @@
userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
}
+ List<Share> list = shareService.list();
+ if (CollectionUtils.isEmpty(list)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ List<Long> objectIds = list.stream().map(Share::getObjectId).distinct().collect(Collectors.toList());
+ List<AppUser> appUsers = appUserClient.listByIds(objectIds);
+ List<Long> appUserIds = appUsers.stream().filter(item -> !item.getDelFlag()).map(AppUser::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(userIds)){
+ userIds = appUserIds;
+ }
Page<Share> page = shareService.lambdaQuery()
@@ -264,7 +274,6 @@
.eq(auditStatus != null, Share::getAuditStatus, auditStatus)
.in(!CollectionUtils.isEmpty(userIds),Share::getObjectId, userIds)
.eq(Share::getDelFlag, 0)
- .orderByAsc(Share::getAuditStatus)
.orderByDesc(Share::getCreateTime)
.page(Page.of(pageNum, pageSize));
for (Share record : page.getRecords()) {
@@ -306,7 +315,8 @@
@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)){
@@ -326,15 +336,17 @@
appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
appUserClient.editAppUserById(appUser);
//添加积分流水
- UserPoint userPoint = new UserPoint();
- userPoint.setAppUserId(userid);
- userPoint.setType(4);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(everySharePoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPointClient.saveUserPoint(userPoint);
+ if(everySharePoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setAppUserId(userid);
+ userPoint.setType(4);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(everySharePoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPointClient.saveUserPoint(userPoint);
+ }
}
}
--
Gitblit v1.7.1