From 872cf657504c4958ee20d526a09422d50205b3cc Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Thu, 9 Jan 2025 14:04:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(memberCenter):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改积分充值逻辑，将金额乘以 100 转换为积分 - 添加会员消费记录保存功能 - 优化订单交易服务，添加充值记录 - 调整支付宝支付类型比较逻辑 - 移除未使用的 RequestConditionEntity 类 --- mcwl-admin/pom.xml | 11 +++++ .../memberCenter/MemberController.java | 2 +- .../pay/AliPay/OrderTradeController.java | 4 +- .../domain/ProductCommentConditionEntity.java | 1 + .../domain/RequestConditionEntity.java | 41 ------------------- .../service/impl/MemberServiceImpl.java | 29 +++++++++---- .../service/impl/OrderTradeServiceImpl.java | 4 ++ 7 files changed, 39 insertions(+), 53 deletions(-) delete mode 100644 mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java diff --git a/mcwl-admin/pom.xml b/mcwl-admin/pom.xml index 5a751d5..d7c6bf5 100644 --- a/mcwl-admin/pom.xml +++ b/mcwl-admin/pom.xml @@ -24,6 +24,17 @@ 0.4.7 + + + + + + + + + + + com.alipay.sdk alipay-easysdk diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java index 602986a..9a384bd 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java @@ -111,7 +111,7 @@ public class MemberController { return AjaxResult.warn("用户不存在"); } - Member member = memberService.rechargePoints(userId, amount * 10); + Member member = memberService.rechargePoints(userId, amount * 100); // 返回充值积分 if (!Optional.ofNullable(member).isPresent()) { diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java index 918f87b..2aada84 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java @@ -118,9 +118,9 @@ public class OrderTradeController extends BaseController { String type = orderTradeDto.getType(); - if ("member".equals(type)) { + if ("member".equalsIgnoreCase(type)) { qrUrl = aliPayIntegration.memberPay(orderTradeDto); - } else if ("points".equals(type)) { + } else if ("points".equalsIgnoreCase(type)) { qrUrl = aliPayIntegration.pointsPay(orderTradeDto.getPaymentAmount()); } diff --git a/mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java b/mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java index a2cf39e..2e86647 100644 --- a/mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java +++ b/mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java @@ -1,6 +1,7 @@ package com.mcwl.comment.domain; +import com.mcwl.common.domain.RequestConditionEntity; import lombok.Data; import java.util.List; diff --git a/mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java b/mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java deleted file mode 100644 index 0522e90..0000000 --- a/mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.mcwl.comment.domain; - -import com.mcwl.common.utils.RequestPageEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * 请求条件实体 - */ -@Data -public class RequestConditionEntity extends RequestPageEntity { - - - /** - * 创建日期范围 - */ - @ApiModelProperty("创建日期范围") - private List betweenTime; - - /** - * 创建开始时间 - */ - private String createBeginTime; - - /** - * 创建结束时间 - */ - private String createEndTime; - - /** - * 自定义excel表头列表 - */ - private List customizeColumnNameList; - - /** - * 查询条件 - */ - private String blurry; -} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java index f237821..92f79ad 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java @@ -7,20 +7,14 @@ import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.common.exception.ServiceException; import com.mcwl.common.utils.SecurityUtils; -import com.mcwl.memberCenter.domain.MemberBenefit; -import com.mcwl.memberCenter.domain.MemberLevel; -import com.mcwl.memberCenter.domain.Member; -import com.mcwl.memberCenter.domain.Promotion; +import com.mcwl.memberCenter.domain.*; import com.mcwl.memberCenter.enums.MemberBenefitTypeEnum; import com.mcwl.memberCenter.enums.MemberEnum; import com.mcwl.memberCenter.enums.MemberPeriodicEnum; import com.mcwl.memberCenter.enums.PromotionEnum; import com.mcwl.memberCenter.mapper.MemberMapper; import com.mcwl.memberCenter.mapper.PromotionMapper; -import com.mcwl.memberCenter.service.MemberBenefitService; -import com.mcwl.memberCenter.service.MemberLevelService; -import com.mcwl.memberCenter.service.MemberService; -import com.mcwl.memberCenter.service.PromotionService; +import com.mcwl.memberCenter.service.*; import com.mcwl.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -41,6 +35,8 @@ public class MemberServiceImpl extends ServiceImpl impleme private final PromotionMapper promotionMapper; + private final MemberConsumeService memberConsumeService; + @Override public Member createUserMember(Long userId, Long memberLevelId, String paymentMethod, Long promotionId) { if (userId == null) { @@ -195,16 +191,19 @@ public class MemberServiceImpl extends ServiceImpl impleme throw new ServiceException("积分不足"); } + // 保存消费记录 + saveMemberConsume(consumePoints, userId, points); + // 先扣除会员的积分 if (member != null) { double mp = member.getPoints() - consumePoints; if (mp >= 0) { member.setPoints(mp); + consumePoints = 0.0; } else { member.setPoints(0D); consumePoints = consumePoints - memberPoints; } - member.setPoints(mp); baseMapper.updateById(member); } // consumePoints有剩余再扣除用户的积分 @@ -215,6 +214,18 @@ public class MemberServiceImpl extends ServiceImpl impleme } + private void saveMemberConsume(Double consumePoints, Long userId, double points) { + MemberConsume memberConsume = new MemberConsume(); + memberConsume.setUserId(userId); + memberConsume.setConsumePoints(consumePoints); + memberConsume.setRemainingPoints(points - consumePoints); + memberConsume.setConsumeTime(new Date()); + memberConsume.setCreateBy(SecurityUtils.getUsername()); + memberConsume.setUpdateBy(SecurityUtils.getUsername()); + memberConsume.setUpdateTime(new Date()); + memberConsumeService.save(memberConsume); + } + private List getUseUserMember(Long userId) { // startDate 小于等于当前时间、endDate 大于等于当前时间 // subscriptionStatus 不为 "过期" 或 "待支付" diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java index 42cb33b..6e846ef 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java @@ -158,11 +158,15 @@ public class OrderTradeServiceImpl extends ServiceImpl