BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 02abe86253527b1b39414e00e7fd00f1a91beab5

Authored by owen
1 parent f6f33a07

member: 

1.用户积分变动方法, 提取到单独的接口中
2.规范代码
Inline Side-by-side
Showing 9 changed files with 91 additions and 54 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @02abe86
... ... @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert;
5 5 import cn.hutool.core.util.IdUtil;
6 6 import cn.hutool.core.util.ObjectUtil;
7 7 import cn.hutool.core.util.StrUtil;
  8 +import cn.hutool.extra.spring.SpringUtil;
8 9 import cn.iocoder.yudao.framework.common.core.KeyValue;
9 10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
10 11 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
... ... @@ -13,6 +14,7 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
13 14 import cn.iocoder.yudao.module.member.api.address.AddressApi;
14 15 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
15 16 import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
  17 +import cn.iocoder.yudao.module.member.api.point.MemberPointApi;
16 18 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
17 19 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
18 20 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
... ... @@ -110,6 +112,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
110 112 private MemberUserApi memberUserApi;
111 113 @Resource
112 114 private MemberLevelApi memberLevelApi;
  115 + @Resource
  116 + private MemberPointApi memberPointApi;
113 117  
114 118 @Resource
115 119 private ProductCommentApi productCommentApi;
... ... @@ -346,9 +350,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
346 350 // TODO 芋艿：OrderLog
347 351  
348 352 // 增加用户积分
349   - addUserPointAsync(order.getUserId(), order.getPayPrice(), order.getId());
  353 + getSelf().addUserPointAsync(order.getUserId(), order.getPayPrice(), order.getId());
350 354 // 增加用户经验
351   - addUserExperienceAsync(order.getUserId(), order.getPayPrice(), order.getId());
  355 + getSelf().addUserExperienceAsync(order.getUserId(), order.getPayPrice(), order.getId());
352 356 }
353 357  
354 358 /**
... ... @@ -617,9 +621,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
617 621 // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效
618 622  
619 623 // 扣减用户积分
620   - reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
  624 + getSelf().reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
621 625 // 扣减用户经验
622   - reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
  626 + getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
623 627 }
624 628  
625 629 @Override
... ... @@ -667,7 +671,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
667 671 TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus()));
668 672 }
669 673  
670   - // TODO @疯狂：直接 this 调用，async 不生效哈。全局搜下 getSelf();
671 674 @Async
672 675 protected void addUserExperienceAsync(Long userId, Integer payPrice, Long orderId) {
673 676 int bizType = MemberExperienceBizTypeEnum.ORDER.getType();
... ... @@ -683,12 +686,22 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
683 686 @Async
684 687 protected void addUserPointAsync(Long userId, Integer payPrice, Long orderId) {
685 688 int bizType = MemberPointBizTypeEnum.ORDER_BUY.getType();
686   - memberUserApi.addPoint(userId, payPrice, bizType, String.valueOf(orderId));
  689 + memberPointApi.addPoint(userId, payPrice, bizType, String.valueOf(orderId));
687 690 }
688 691  
689 692 @Async
690 693 protected void reduceUserPointAsync(Long userId, Integer refundPrice, Long afterSaleId) {
691 694 int bizType = MemberPointBizTypeEnum.ORDER_CANCEL.getType();
692   - memberUserApi.addPoint(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
  695 + memberPointApi.addPoint(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
693 696 }
  697 +
  698 + /**
  699 + * 获得自身的代理对象，解决 AOP 生效问题
  700 + *
  701 + * @return 自己
  702 + */
  703 + private TradeOrderUpdateServiceImpl getSelf() {
  704 + return SpringUtil.getBean(getClass());
  705 + }
  706 +
694 707 }
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java 0 → 100644
  View file @02abe86
  1 +package cn.iocoder.yudao.module.member.api.point;
  2 +
  3 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
  4 +
  5 +/**
  6 + * 用户积分的 API 接口
  7 + *
  8 + * @author owen
  9 + */
  10 +public interface MemberPointApi {
  11 +
  12 + /**
  13 + * 增加用户积分
  14 + *
  15 + * @param userId 用户编号
  16 + * @param point 积分
  17 + * @param bizType 业务类型 {@link MemberPointBizTypeEnum}
  18 + * @param bizId 业务编号
  19 + */
  20 + void addPoint(Long userId, Integer point, Integer bizType, String bizId);
  21 +
  22 +}
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
  View file @02abe86
1 1 package cn.iocoder.yudao.module.member.api.user;
2 2  
3 3 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
4   -import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
5 4  
6 5 import java.util.Collection;
7 6 import java.util.List;
... ... @@ -57,16 +56,4 @@ public interface MemberUserApi {
57 56 * @return 用户信息
58 57 */
59 58 MemberUserRespDTO getUserByMobile(String mobile);
60   -
61   - // TODO @疯狂：是不是新的类，MemberPointApi？
62   - /**
63   - * 增加用户积分
64   - *
65   - * @param userId 用户编号
66   - * @param point 积分
67   - * @param bizType 业务类型 {@link MemberPointBizTypeEnum}
68   - * @param bizId 业务编号
69   - */
70   - void addPoint(Long userId, Integer point, Integer bizType, String bizId);
71   -
72 59 }
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/MemberExperienceBizTypeEnum.java
  View file @02abe86
... ... @@ -18,12 +18,12 @@ public enum MemberExperienceBizTypeEnum {
18 18 /**
19 19 * 管理员调整、邀请新用户、下单、退单、签到、抽奖
20 20 */
21   - ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", false),
22   - INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", false),
23   - ORDER(2, "下单奖励", "下单获得 {} 经验", false),
24   - REFUND(3, "退单扣除", "退单获得 {} 经验", true),
25   - SIGN_IN(4, "签到奖励", "签到获得 {} 经验", false),
26   - LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", false),
  21 + ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", true),
  22 + INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", true),
  23 + ORDER(2, "下单奖励", "下单获得 {} 经验", true),
  24 + REFUND(3, "退单扣除", "退单获得 {} 经验", false),
  25 + SIGN_IN(4, "签到奖励", "签到获得 {} 经验", true),
  26 + LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", true),
27 27 ;
28 28  
29 29 /**
... ... @@ -41,7 +41,7 @@ public enum MemberExperienceBizTypeEnum {
41 41 /**
42 42 * 是否为扣减积分
43 43 */
44   - private final boolean isReduce;
  44 + private final boolean add;
45 45  
46 46 public static MemberExperienceBizTypeEnum getByType(Integer type) {
47 47 return EnumUtil.getBy(MemberExperienceBizTypeEnum.class,
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java
  View file @02abe86
... ... @@ -16,9 +16,9 @@ import java.util.Objects;
16 16 @Getter
17 17 public enum MemberPointBizTypeEnum implements IntArrayValuable {
18 18  
19   - SIGN(1, "签到", "签到获得 {} 积分", false),
20   - ORDER_BUY(10, "订单消费", "下单获得 {} 积分", false),
21   - ORDER_CANCEL(11, "订单取消", "退单获得 {} 积分", true); // 退回积分
  19 + SIGN(1, "签到", "签到获得 {} 积分", true),
  20 + ORDER_BUY(10, "订单消费", "下单获得 {} 积分", true),
  21 + ORDER_CANCEL(11, "订单取消", "退单获得 {} 积分", false); // 退回积分
22 22  
23 23 /**
24 24 * 类型
... ... @@ -32,11 +32,10 @@ public enum MemberPointBizTypeEnum implements IntArrayValuable {
32 32 * 描述
33 33 */
34 34 private final String description;
35   - // TODO @疯狂：改成 add 会好点。一个是属性我们尽量不要 isXXX；另外尽量正向思维，不取反；
36 35 /**
37 36 * 是否为扣减积分
38 37 */
39   - private final boolean isReduce;
  38 + private final boolean add;
40 39  
41 40 @Override
42 41 public int[] array() {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java 0 → 100644
  View file @02abe86
  1 +package cn.iocoder.yudao.module.member.api.point;
  2 +
  3 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
  4 +import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
  5 +import org.springframework.stereotype.Service;
  6 +import org.springframework.validation.annotation.Validated;
  7 +
  8 +import javax.annotation.Resource;
  9 +
  10 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  11 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
  12 +
  13 +/**
  14 + * 用户积分的 API 实现类
  15 + *
  16 + * @author owen
  17 + */
  18 +@Service
  19 +@Validated
  20 +public class MemberPointApiImpl implements MemberPointApi {
  21 +
  22 + @Resource
  23 + private MemberPointRecordService memberPointRecordService;
  24 +
  25 + @Override
  26 + public void addPoint(Long userId, Integer point, Integer bizType, String bizId) {
  27 + MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
  28 + if (bizTypeEnum == null) {
  29 + throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
  30 + }
  31 + memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId);
  32 + }
  33 +
  34 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
  View file @02abe86
... ... @@ -3,8 +3,6 @@ package cn.iocoder.yudao.module.member.api.user;
3 3 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
4 4 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
5 5 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
6   -import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
7   -import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
8 6 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
9 7 import org.springframework.stereotype.Service;
10 8 import org.springframework.validation.annotation.Validated;
... ... @@ -13,9 +11,6 @@ import javax.annotation.Resource;
13 11 import java.util.Collection;
14 12 import java.util.List;
15 13  
16   -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
17   -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
18   -
19 14 /**
20 15 * 会员用户的 API 实现类
21 16 *
... ... @@ -28,9 +23,6 @@ public class MemberUserApiImpl implements MemberUserApi {
28 23 @Resource
29 24 private MemberUserService userService;
30 25  
31   - @Resource
32   - private MemberPointRecordService memberPointRecordService;
33   -
34 26 @Override
35 27 public MemberUserRespDTO getUser(Long id) {
36 28 MemberUserDO user = userService.getUser(id);
... ... @@ -52,13 +44,4 @@ public class MemberUserApiImpl implements MemberUserApi {
52 44 return MemberUserConvert.INSTANCE.convert2(userService.getUserByMobile(mobile));
53 45 }
54 46  
55   - @Override
56   - public void addPoint(Long userId, Integer point, Integer bizType, String bizId) {
57   - MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
58   - if (bizTypeEnum == null) {
59   - throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
60   - }
61   - memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId);
62   - }
63   -
64 47 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
  View file @02abe86
... ... @@ -232,7 +232,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
232 232 if (experience == 0) {
233 233 return;
234 234 }
235   - if (bizType.isReduce() && experience > 0) {
  235 + if (!bizType.isAdd() && experience > 0) {
236 236 experience = -experience;
237 237 }
238 238  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @02abe86
1 1 package cn.iocoder.yudao.module.member.service.point;
2 2  
3   -import cn.hutool.core.util.NumberUtil;
4 3 import cn.hutool.core.util.ObjectUtil;
5 4 import cn.hutool.core.util.StrUtil;
6 5 import cn.iocoder.yudao.framework.common.pojo.PageParam;
... ... @@ -75,15 +74,15 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
75 74  
76 75 // 1. 根据配置的比例，换算实际的积分
77 76 point = point * pointConfig.getTradeGivePoint();
78   - if (bizType.isReduce() && point > 0) {
  77 + if (!bizType.isAdd() && point > 0) {
79 78 point = -point;
80 79 }
81 80  
82 81 // 2. 增加积分记录
83 82 MemberUserDO user = memberUserService.getUser(userId);
84 83 Integer userPoint = ObjectUtil.defaultIfNull(user.getPoint(), 0);
85   - // 用户变动后的积分，防止扣出负数 TODO 疯狂：积分是不是允许扣到负数。因为它是跟有钱有关的东西，不能让商家出现资金损失
86   - Integer totalPoint = NumberUtil.max(userPoint + point, 0);
  84 + // 用户变动后的积分
  85 + Integer totalPoint = userPoint + point;
87 86 MemberPointRecordDO recordDO = new MemberPointRecordDO()
88 87 .setUserId(userId)
89 88 .setBizId(bizId)
... ...