czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

积分 赠送与扣除

This commit is contained in:
wangw 2025-03-05 17:15:53 +08:00
parent a0bc070395
commit 9153cd6c6d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@ -75,7 +75,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
private RedisService redisService; private RedisService redisService;
@Resource @Resource
private RabbitPublisher rabbitPublisher; private RabbitPublisher rabbitPublisher;
@Resource @DubboReference
private MemberPointsService pointsService; private MemberPointsService pointsService;
@DubboReference @DubboReference
private ShopInfoService shopInfoService; private ShopInfoService shopInfoService;
@ -480,9 +480,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
upOrderInfo(orderInfo, new BigDecimal(czgCallBackDto.getAmount() / 100L), upOrderInfo(orderInfo, new BigDecimal(czgCallBackDto.getAmount() / 100L),
DateUtil.parseLocalDateTime(czgCallBackDto.getPayTime()), payment.getId(), null); DateUtil.parseLocalDateTime(czgCallBackDto.getPayTime()), payment.getId(), null);
if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) { if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
pointsService.deductPoints(orderInfo.getUserId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo.getId()); pointsService.deductPoints(orderInfo.getUserId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
} }
pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo.getId()); pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo);
redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId()); redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
} else if ("memberIn".equals(payment.getPayType()) || "free".equals(payment.getPayType())) { } else if ("memberIn".equals(payment.getPayType()) || "free".equals(payment.getPayType())) {
boolean isFree = "free".equals(payment.getPayType()); boolean isFree = "free".equals(payment.getPayType());

8
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@ -76,11 +76,11 @@ public class PayServiceImpl implements PayService {
private ShopActivateCouponRecordService inRecordService; private ShopActivateCouponRecordService inRecordService;
@DubboReference @DubboReference
private ShopCouponService couponService; private ShopCouponService couponService;
@DubboReference
private MemberPointsService pointsService;
@Resource @Resource
private CzgPayService czgPayService; private CzgPayService czgPayService;
@Resource @Resource
private MemberPointsService pointsService;
@Resource
private OrderInfoService orderInfoService; private OrderInfoService orderInfoService;
@Resource @Resource
private OrderDetailService orderDetailService; private OrderDetailService orderDetailService;
@ -154,9 +154,9 @@ public class PayServiceImpl implements PayService {
orderInfoService.upOrderInfo(orderInfo, orderInfo.getOrderAmount(), orderInfoService.upOrderInfo(orderInfo, orderInfo.getOrderAmount(),
LocalDateTime.now(), null, PayEnums.CASH_PAY); LocalDateTime.now(), null, PayEnums.CASH_PAY);
if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) { if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
pointsService.deductPoints(orderInfo.getUserId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo.getId()); pointsService.deductPoints(orderInfo.getUserId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
} }
pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo.getId()); pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo);
redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId()); redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
return CzgResult.success(); return CzgResult.success();
} }