|
|
@@ -458,7 +458,7 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
discountAmount = account.getDiscountAmount() - refundLogList.stream().mapToInt(RefundLog::getDiscountAmount).sum();
|
|
|
}
|
|
|
refundLog.setDiscountAmount(discountAmount);
|
|
|
- refundLog.setReason(reason);
|
|
|
+ refundLog.setReason(CommUtil.isEmptyOrNull(reason) ? reason : JSONObject.parseObject(reason).getString("reason"));
|
|
|
newRefundLogList.add(index, refundLog);
|
|
|
}));
|
|
|
|
|
|
@@ -588,7 +588,7 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
LOGGER.info("微信退款回调{}:业务处理结束", notifyRes[2]);
|
|
|
|
|
|
// 退款时,充值权益失效(权益余额转入冻结余额,接收退款通知时权益状态设置为失效)
|
|
|
- userRechargeRightsService.lambdaUpdate().set(UserRechargeRights::getStatus,UserRechargeRights.STATUS_无效)
|
|
|
+ userRechargeRightsService.lambdaUpdate().set(UserRechargeRights::getStatus, UserRechargeRights.STATUS_无效)
|
|
|
.eq(UserRechargeRights::getUserId, walletDetail.getUserId())
|
|
|
.eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效).update();
|
|
|
|