|
@@ -399,9 +399,13 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
// 将余额转移至冻结余额
|
|
// 将余额转移至冻结余额
|
|
|
accountService.lambdaUpdate().setSql(" frozen_amount = (frozen_amount + balance) ,balance = 0").eq(Account::getUserId, userId).update();
|
|
accountService.lambdaUpdate().setSql(" frozen_amount = (frozen_amount + balance) ,balance = 0").eq(Account::getUserId, userId).update();
|
|
|
|
|
|
|
|
- // 退款时,充值权益失效(权益余额转入冻结余额,接收退款通知时权益状态设置为失效)
|
|
|
|
|
- userRechargeRightsService.lambdaUpdate().setSql("frozen_balance = (rights_balance + frozen_balance) , rights_balance = 0")
|
|
|
|
|
- .eq(UserRechargeRights::getUserId, userId).eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效).update();
|
|
|
|
|
|
|
+ // 退款时,充值权益失效(权益余额转入冻结余额,权益状态设置为失效)
|
|
|
|
|
+ userRechargeRightsService.lambdaUpdate()
|
|
|
|
|
+ .setSql("frozen_balance = (rights_balance + frozen_balance) , rights_balance = 0")
|
|
|
|
|
+ .set(UserRechargeRights::getStatus, UserRechargeRights.STATUS_无效)
|
|
|
|
|
+ .eq(UserRechargeRights::getUserId, userId)
|
|
|
|
|
+ .eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效)
|
|
|
|
|
+ .update();
|
|
|
|
|
|
|
|
// 余减去优惠金额作为退款金额
|
|
// 余减去优惠金额作为退款金额
|
|
|
AtomicInteger refundAmount = new AtomicInteger(account.getBalance() - account.getDiscountAmount());
|
|
AtomicInteger refundAmount = new AtomicInteger(account.getBalance() - account.getDiscountAmount());
|
|
@@ -598,9 +602,9 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
LOGGER.info("微信退款回调{}:业务处理结束", notifyRes[2]);
|
|
LOGGER.info("微信退款回调{}:业务处理结束", notifyRes[2]);
|
|
|
|
|
|
|
|
// 退款时,充值权益失效(权益余额转入冻结余额,接收退款通知时权益状态设置为失效)
|
|
// 退款时,充值权益失效(权益余额转入冻结余额,接收退款通知时权益状态设置为失效)
|
|
|
- userRechargeRightsService.lambdaUpdate().set(UserRechargeRights::getStatus, UserRechargeRights.STATUS_无效)
|
|
|
|
|
- .eq(UserRechargeRights::getUserId, walletDetail.getUserId())
|
|
|
|
|
- .eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效).update();
|
|
|
|
|
|
|
+// userRechargeRightsService.lambdaUpdate().set(UserRechargeRights::getStatus, UserRechargeRights.STATUS_无效)
|
|
|
|
|
+// .eq(UserRechargeRights::getUserId, walletDetail.getUserId())
|
|
|
|
|
+// .eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效).update();
|
|
|
|
|
|
|
|
return ResponseEntity.status(HttpStatus.OK).build();
|
|
return ResponseEntity.status(HttpStatus.OK).build();
|
|
|
} else {
|
|
} else {
|