autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改余额退款逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-23 11:51:12 +08:00
parent ffcb73c240
commit fd54ea8871
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java
View File

@@ -630,6 +630,8 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
logger.info("【{}】-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
// 订单编号
String orderCode = orderBasicInfo.getOrderCode();
String merchantId = orderBasicInfo.getMerchantId();
// 订单消费金额
BigDecimal orderAmount = orderBasicInfo.getOrderAmount();
// 查支付记录
@@ -651,6 +653,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
// 更新会员钱包/余额退回到钱包
UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder()
.memberId(orderBasicInfo.getMemberId())
.targetMerchantId(merchantId)
.type(MemberWalletEnum.TYPE_IN.getValue()) // 进账
.subType(MemberWalletEnum.SUBTYPE_ORDER_SETTLEMENT_REFUND.getValue()) // 订单结算退款
.updatePrincipalBalance(returnPrincipal)
@@ -659,12 +662,12 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO);
// 更新order_pay_record, 解冻部分
List<Map<String, Object>> list = calculateUnfreezeAmount(orderAmount, payRecordList);
for (Map<String, Object> map : list) {
String paymentId = (String) map.get("paymentId");
BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount");
memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount);
}
// List<Map<String, Object>> list = calculateUnfreezeAmount(orderAmount, payRecordList);
// for (Map<String, Object> map : list) {
// String paymentId = (String) map.get("paymentId");
// BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount");
// memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount);
// }
}
/**