diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java index e3497b38..f3620b8d 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java @@ -87,8 +87,8 @@ public class MemberPointsController { */ @PostMapping("payedDeductPoints") public CzgResult deductPoints(@RequestBody PayedDeductPointsParam param) { - boolean ret = memberPointsService.deductPoints(param.getUserId(), param.getPoints(), param.getContent(), param.getOrderId()); - return CzgResult.success(ret); + //boolean ret = memberPointsService.deductPoints(param.getUserId(), param.getPoints(), param.getContent(), param.getOrderId()); + return CzgResult.success(); } /** @@ -96,7 +96,7 @@ public class MemberPointsController { */ @PostMapping("consumeAwardPoints") public CzgResult consumeAwardPoints(@RequestBody ConsumeAwardPointsParam param) { - memberPointsService.consumeAwardPoints(param.getUserId(), param.getOrderId()); + //memberPointsService.consumeAwardPoints(param.getUserId(), param.getOrderId()); return CzgResult.success(); } diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java index cd650d85..d328362e 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java @@ -79,9 +79,10 @@ public class UMemberPointsController { /** * 003-根据积分计算可抵扣金额 - * @param userId 用户id - * @param orderAmount 订单金额 - * @param points 使用积分 + * + * @param userId 用户id + * @param orderAmount 订单金额 + * @param points 使用积分 */ @GetMapping("calcDeductionAmount") public CzgResult calcDeductionAmount(@RequestParam Long userId, @RequestParam BigDecimal orderAmount, @RequestParam Integer points) { @@ -94,8 +95,8 @@ public class UMemberPointsController { */ @PostMapping("payedDeductPoints") public CzgResult deductPoints(@RequestBody PayedDeductPointsParam param) { - boolean ret = memberPointsService.deductPoints(param.getUserId(), param.getPoints(), param.getContent(), param.getOrderId()); - return CzgResult.success(ret); + //boolean ret = memberPointsService.deductPoints(param.getUserId(), param.getPoints(), param.getContent(), param.getOrderId()); + return CzgResult.success(); } /** @@ -103,7 +104,7 @@ public class UMemberPointsController { */ @PostMapping("consumeAwardPoints") public CzgResult consumeAwardPoints(@RequestBody ConsumeAwardPointsParam param) { - memberPointsService.consumeAwardPoints(param.getUserId(), param.getOrderId()); + //memberPointsService.consumeAwardPoints(param.getUserId(), param.getOrderId()); return CzgResult.success(); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java index e647e6df..7d67bd11 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java @@ -3,6 +3,7 @@ package com.czg.account.service; import com.czg.account.dto.points.OrderDeductionPointsDTO; import com.czg.account.entity.MemberPoints; import com.czg.account.param.MemberPointsParam; +import com.czg.order.entity.OrderInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; @@ -73,9 +74,9 @@ public interface MemberPointsService extends IService { * @param userId 用户id * @param points 积分 * @param content 摘要信息(如:兑换积分商品/积分抵扣账单/消费赠送积分/新会员送积分/储值赠送积分) - * @param orderId 订单id,可以为空 + * @param orderInfo 订单信息,可以为空 */ - boolean deductPoints(Long userId, int points, String content, Long orderId); + boolean deductPoints(Long userId, int points, String content, OrderInfo orderInfo); /** * 追加积分 @@ -83,17 +84,17 @@ public interface MemberPointsService extends IService { * @param userId 用户id * @param points 积分 * @param content 摘要信息(如:兑换积分商品/积分抵扣账单/消费赠送积分/新会员送积分/储值赠送积分) - * @param orderId 订单id,可以为空 + * @param orderInfo 订单信息,可以为空 * @return 成功/失败 */ - boolean addPoints(Long userId, int points, String content, Long orderId); + boolean addPoints(Long userId, int points, String content, OrderInfo orderInfo); /** * 消费赠送积分 * * @param userId 用户id - * @param orderId 订单id + * @param orderInfo 订单信息,可以为空 */ - void consumeAwardPoints(Long userId, Long orderId); + void consumeAwardPoints(Long userId, OrderInfo orderInfo); } \ No newline at end of file diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java index 7fe8e701..20c68f8f 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java @@ -13,7 +13,6 @@ import com.czg.account.service.MemberPointsService; import com.czg.enums.YesNoEnum; import com.czg.exception.CzgException; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; import com.czg.sa.StpKit; import com.czg.service.account.mapper.MemberPointsLogMapper; import com.czg.service.account.mapper.MemberPointsMapper; @@ -23,7 +22,6 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,8 +42,6 @@ public class MemberPointsServiceImpl extends ServiceImpl