czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 霸王餐返还订单券

Browse Source
This commit is contained in:
张松
2024-11-23 11:28:25 +08:00
parent 165e1fde14
commit e1b4e2500a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -192,6 +192,7 @@ public class PayService {
private final TbShopCouponService shopCouponService; private final TbShopCouponService shopCouponService;
private final MpMemberInMapper mpMemberInMapper; private final MpMemberInMapper mpMemberInMapper;
private final TbMemberPointsServiceImpl memberPointsService; private final TbMemberPointsServiceImpl memberPointsService;
private final CartService cartService;
@Qualifier("tbShopCouponService") @Qualifier("tbShopCouponService")
@Autowired @Autowired
@@ -204,13 +205,14 @@ public class PayService {
private TbFreeDineRecordMapper tbFreeDineRecordMapper; private TbFreeDineRecordMapper tbFreeDineRecordMapper;
private final TbFreeDineRecordService freeDineRecordService; private final TbFreeDineRecordService freeDineRecordService;
public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService, MpShopTableService mpShopTableService, TbFreeDineConfigService freeDineConfigService, TbShopCouponService shopCouponService, MpMemberInMapper mpMemberInMapper, TbMemberPointsServiceImpl memberPointsService, TbFreeDineRecordService freeDineRecordService) { public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService, MpShopTableService mpShopTableService, TbFreeDineConfigService freeDineConfigService, TbShopCouponService shopCouponService, MpMemberInMapper mpMemberInMapper, TbMemberPointsServiceImpl memberPointsService, CartService cartService, TbFreeDineRecordService freeDineRecordService) {
this.shopSongOrderService = shopSongOrderService; this.shopSongOrderService = shopSongOrderService;
this.mpShopTableService = mpShopTableService; this.mpShopTableService = mpShopTableService;
this.freeDineConfigService = freeDineConfigService; this.freeDineConfigService = freeDineConfigService;
this.shopCouponService = shopCouponService; this.shopCouponService = shopCouponService;
this.mpMemberInMapper = mpMemberInMapper; this.mpMemberInMapper = mpMemberInMapper;
this.memberPointsService = memberPointsService; this.memberPointsService = memberPointsService;
this.cartService = cartService;
this.freeDineRecordService = freeDineRecordService; this.freeDineRecordService = freeDineRecordService;
} }
@@ -386,6 +388,15 @@ public class PayService {
} }
private BigDecimal getFreeDineOrderInfo(MemberInDTO payDTO, TbUserInfo userInfo) { private BigDecimal getFreeDineOrderInfo(MemberInDTO payDTO, TbUserInfo userInfo) {
// 取消券
UseCouponDTO useCouponDTO = new UseCouponDTO();
useCouponDTO.setOrderId(payDTO.getOrderId());
useCouponDTO.setUserCouponInfos(new ArrayList<>());
useCouponDTO.setPointsNum(null);
useCouponDTO.setShopId(payDTO.getShopId());
cartService.useCoupon(useCouponDTO);
TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>() TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, payDTO.getOrderId()) .eq(TbOrderInfo::getId, payDTO.getOrderId())
.in(TbOrderInfo::getStatus, TableConstant.OrderInfo.Status.UNPAID.getValue(), TableConstant.OrderInfo.Status.PAYING.getValue())); .in(TbOrderInfo::getStatus, TableConstant.OrderInfo.Status.UNPAID.getValue(), TableConstant.OrderInfo.Status.PAYING.getValue()));
@@ -419,13 +430,13 @@ public class PayService {
} }
// 返还优惠券 // 返还优惠券
returnCoupon(orderInfo, shopCouponService, mpCashierCartMapper); // returnCoupon(orderInfo, shopCouponService, mpCashierCartMapper);
BigDecimal shouldPayAmount = orderInfo.getOriginAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes())); BigDecimal shouldPayAmount = orderInfo.getOriginAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));
// 霸王餐积分抵扣 // 霸王餐积分抵扣 预留
if (payDTO.getPointsNum() != null) { if (false && payDTO.getPointsNum() != null) {
OrderDeductionPointsDTO memberUsablePoints = memberPointsService.getMemberUsablePoints(Long.valueOf(userInfo.getId()), shouldPayAmount); OrderDeductionPointsDTO memberUsablePoints = memberPointsService.getMemberUsablePoints(Long.valueOf(userInfo.getId()), shouldPayAmount);
if (!memberUsablePoints.getUsable()) { if (!memberUsablePoints.getUsable()) {
throw new MsgException(memberUsablePoints.getUnusableReason()); throw new MsgException(memberUsablePoints.getUnusableReason());