diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkConsumeCashbackService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkConsumeCashbackService.java index 193f0054e..40023bbcd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkConsumeCashbackService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkConsumeCashbackService.java @@ -9,7 +9,7 @@ import com.czg.market.entity.MkConsumeCashback; import java.math.BigDecimal; /** - * 服务层。 + * 服务层。 * * @author zs * @since 2025-10-13 @@ -21,11 +21,14 @@ public interface MkConsumeCashbackService extends IService { /** * 消费返现 - * @param shopId 店铺id - * @param userId 用户id - * @param amount 金额 + * + * @param shopId 店铺id + * @param userId 用户id + * @param amount 金额 * @param orderId 订单id * @param orderNo 订单号 */ void cashback(Long shopId, Long userId, BigDecimal amount, Long orderId, String orderNo); + + void removeCashback(Long shopId, Long userId, Long orderId, String orderNo); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserService.java index 3aec4daf5..9a48f4988 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserService.java @@ -29,9 +29,9 @@ public interface MkPointsUserService extends IService { * 获取用户积分信息 * 返回的数据ID可能为空 不影响修改用户积分 统一接口的处理 * - * @param shopId 店铺Id + * @param shopId 店铺Id * @param shopUserId 店铺用户Id - * @param userId 会员Id + * @param userId 会员Id */ MkPointsUser getPointsUser(Long shopId, Long shopUserId, Long userId); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumerCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumerCouponService.java index 28e9b8d89..aaa282363 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumerCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumerCouponService.java @@ -22,6 +22,12 @@ public interface MkShopConsumerCouponService extends IService distributionUserService.refund(orderId, orderNo), + "订单id:{} 退款,分销处理失败", orderId); + if (userId != null) { + FunUtils.safeRunVoid(() -> consumerCouponService.removeConsumerCoupon(shopId, userId, orderId), + "订单id:{} 退款,消费赠券回撤处理失败", orderId); + FunUtils.safeRunVoid(() -> consumeCashbackService.removeCashback(shopId, userId, orderId, orderNo), + "订单id:{} 退款,消费返现处理失败", orderId); + FunUtils.safeRunVoid(() -> { + if (pointsNum != null && pointsNum > 0) { + mkPointsUserService.alterPoints(userId, null, shopId, PointsConstant.ADD, + pointsNum, orderId, StrUtil.format("订单退款返还{}积分", pointsNum)); + } + }, + "订单id:{} 退款,积分返还处理失败", orderId); + } + } + @Override @Transactional public void refundOrder(@NonNull Long shopId, @NonNull Long orderId, @NonNull Long payOrderId, @NonNull String refPayOrderNo,