From a8267af843e8de910a09a4471131358a70c397e0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 15:57:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java | 12 ++++++------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 1 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java | 4 ++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/TechnicianStatus.java | 1 -
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 8 ++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 8 ++++----
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java | 2 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 2 +-
8 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
index b63b819..5a681b5 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
@@ -91,4 +91,8 @@
@TableField(exist = false)
private String shopName;
+ @ApiModelProperty(value = "增或减标识： 1-增 2-减")
+ @TableField(exist = false)
+ private Integer flag;
+
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
index 03ac447..220e3da 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
@@ -38,7 +38,7 @@
private Long id;
@ApiModelProperty(value = "变动类型（1-消费，2-返佣，3-拉新，4-每日分享，5-每日签到，6-使用时长， 7-注册积分， 8-门店业绩，" +
- "9-门店返佣，14-下级门店返佣，10-技师业绩，11-兑换商品，12-他人赠送，13-赠与他人,14-兑换券）")
+ "9-门店返佣，14-下级门店返佣，10-技师业绩，11-兑换商品，12-他人赠送，13-赠与他人,15-兑换券）")
@TableField("type")
private Integer type;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 72ecbac..fb7fb41 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -374,7 +374,7 @@
.eq(AppUser::getDelFlag, 0));
ArrayList<Long> userIds = new ArrayList<>();
userIds.add(userId);
- getUserAncestorList(user,userIds, appUserList);
+ getUserAncestorList(user,userIds,new ArrayList<>(),appUserList);
// Long count1 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
// Long count2 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
// Long count3 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
@@ -399,8 +399,8 @@
}
return R.ok(user);
}
- public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> list) {
- List<AppUser> children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
+ public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {
+ children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(children)){
user.setCount1((user.getCount1() == null ? 0L : user.getCount1()) + children.stream().filter(e->e.getVipId() == 1).count());
user.setCount2((user.getCount2() == null ? 0L : user.getCount2()) + children.stream().filter(e->e.getVipId() == 2).count());
@@ -410,7 +410,7 @@
user.setCount6((user.getCount6() == null ? 0L : user.getCount6()) + children.stream().filter(e->e.getVipId() == 6).count());
user.setCount7((user.getCount7() == null ? 0L : user.getCount7()) + children.stream().filter(e->e.getVipId() == 7).count());
List<Long> userIdList = children.stream().map(AppUser::getId).collect(Collectors.toList());
- getUserAncestorList(user,userIdList, children);
+ getUserAncestorList(user,userIdList, children,list);
}
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 5d4404d..fe902b7 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -244,7 +244,7 @@
appUserService.updateById(byId);
UserPoint userPoint = new UserPoint();
- userPoint.setType(14);
+ userPoint.setType(15);
userPoint.setHistoricalPoint(lavePoint);
userPoint.setVariablePoint(point);
userPoint.setBalance(byId.getLavePoint());
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index 75701a6..db23e80 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -118,6 +118,14 @@
bc.setUserName(appUser.getName());
bc.setAmount(o.getPaymentAmount());
});
+
+ BigDecimal beforeAmount = bc.getBeforeAmount();
+ BigDecimal afterAmount = bc.getAfterAmount();
+ if (beforeAmount.compareTo(afterAmount) > 0){
+ bc.setFlag(2);
+ }else {
+ bc.setFlag(1);
+ }
});
}
return R.ok(list);
diff --git a/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java b/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java
index 7f258a0..ec40325 100644
--- a/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java
+++ b/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java
@@ -24,10 +24,10 @@
List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
.ne(AppUser::getStatus, 3)
.eq(AppUser::getDelFlag, 0));
- AppUser user = appUserService.getById(1879046499735789569L);
+ AppUser user = appUserService.getById(1879047378761244673L);
ArrayList<Long> userIds = new ArrayList<>();
- userIds.add(1879046499735789569L);
- getUserAncestorList(user,userIds, appUserList);
+ userIds.add(1879047378761244673L);
+ getUserAncestorList(user,userIds, new ArrayList<>(),appUserList);
System.err.println(user.getCount1());
System.err.println(user.getCount2());
System.err.println(user.getCount3());
@@ -36,8 +36,8 @@
System.err.println(user.getCount6());
System.err.println(user.getCount7());
}
- public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> list) {
- List<AppUser> children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
+ public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {
+ children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(children)){
user.setCount1((user.getCount1() == null ? 0L : user.getCount1()) + children.stream().filter(e->e.getVipId() == 1).count());
user.setCount2((user.getCount2() == null ? 0L : user.getCount2()) + children.stream().filter(e->e.getVipId() == 2).count());
@@ -47,7 +47,7 @@
user.setCount6((user.getCount6() == null ? 0L : user.getCount6()) + children.stream().filter(e->e.getVipId() == 6).count());
user.setCount7((user.getCount7() == null ? 0L : user.getCount7()) + children.stream().filter(e->e.getVipId() == 7).count());
List<Long> userIdList = children.stream().map(AppUser::getId).collect(Collectors.toList());
- getUserAncestorList(user,userIdList, children);
+ getUserAncestorList(user,userIdList, children,list);
}
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 9ed66d0..d621963 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -283,6 +283,7 @@
if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
order.setTechnicianId(Integer.valueOf(technicianId));
}
+ // TODO
orderMapper.updateById(order);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/TechnicianStatus.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/TechnicianStatus.java
index 7e7a80e..23e3f28 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/TechnicianStatus.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/TechnicianStatus.java
@@ -5,7 +5,6 @@
@Getter
public enum TechnicianStatus {
UNSUBSCRIBE(0, "待服务"),
- SERVE(1, "已服务"),
CANCEL(2, "已取消"),
EXPIRED(3, "已到期");
private final Integer code;
--
Gitblit v1.7.1