autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-22 08:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

希晓余额支付bug修复

Browse Source
This commit is contained in:
Guoqs
2024-12-30 11:41:03 +08:00
parent a0d8122ef2
commit e8e85af444
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
View File

@@ -145,7 +145,7 @@ public class PayController extends BaseController {
} }
response = new RestApiResponse<>(map); response = new RestApiResponse<>(map);
} catch (BusinessException e) { } catch (BusinessException e) {
logger.warn("支付订单接口 warn param:{}", dto, e); logger.error("支付订单接口 warn param:{}", dto, e);
response = new RestApiResponse<>(e.getCode(), e.getMessage()); response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) { } catch (Exception e) {
logger.error("支付订单接口 error param:{}", dto, e); logger.error("支付订单接口 error param:{}", dto, e);

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.alipay.api.domain.ChargeOrderInfo;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@@ -3250,9 +3249,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
BigDecimal remedialAmount = orderInfo.getRemedialAmount(); BigDecimal remedialAmount = orderInfo.getRemedialAmount();
orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount)); orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount));
} }
// 更新订单信息
this.updateOrderBasicInfo(orderInfo); this.updateOrderBasicInfo(orderInfo);
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

@@ -256,6 +256,9 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
giftBalancePay = stringBigDecimalMap.get("giftBalancePay"); giftBalancePay = stringBigDecimalMap.get("giftBalancePay");
} }
// 更新支付金额 = 本金支付金额 + 赠送金支付金额
chargeAmount = principalBalancePay.add(giftBalancePay);
// 更新会员钱包 全部金额都用于支付订单 // 更新会员钱包 全部金额都用于支付订单
UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder() UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder()
.memberId(memberId) .memberId(memberId)