## Opt - 调整分账保留小数逻辑&比例
This commit is contained in:
parent
c4b6ea06cf
commit
96ce81eb46
|
@ -265,8 +265,8 @@ public class JdPayServiceImpl implements IJdPayService {
|
||||||
if(i == separateAccounts.size() - 1){
|
if(i == separateAccounts.size() - 1){
|
||||||
subTradeAmount = remaining;
|
subTradeAmount = remaining;
|
||||||
}else{
|
}else{
|
||||||
subTradeAmount = tradeAmount.subtract(tradeAmount.multiply(separateAccount.getProportion().setScale(2, BigDecimal.ROUND_HALF_UP)));
|
subTradeAmount = tradeAmount.subtract(tradeAmount.multiply(separateAccount.getProportion().setScale(2, BigDecimal.ROUND_DOWN)).setScale(2, BigDecimal.ROUND_DOWN));
|
||||||
remaining = remaining.subtract(subTradeAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
|
remaining = remaining.subtract(subTradeAmount).setScale(2, BigDecimal.ROUND_DOWN);
|
||||||
}
|
}
|
||||||
JdPayDivisionAccountTradeInfo divisionAccountTradeInfo = new JdPayDivisionAccountTradeInfo();
|
JdPayDivisionAccountTradeInfo divisionAccountTradeInfo = new JdPayDivisionAccountTradeInfo();
|
||||||
divisionAccountTradeInfo.setMerchantNo(separateAccount.getAccount());
|
divisionAccountTradeInfo.setMerchantNo(separateAccount.getAccount());
|
||||||
|
|
|
@ -111,9 +111,9 @@ jd:
|
||||||
# refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
|
# refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
|
||||||
separateAccounts:
|
separateAccounts:
|
||||||
- account: 153428607007
|
- account: 153428607007
|
||||||
proportion: 0.5
|
proportion: 0.7
|
||||||
- account: 153428607005
|
- account: 153428607005
|
||||||
proportion: 0.5
|
proportion: 0.3
|
||||||
wechat-alipay:
|
wechat-alipay:
|
||||||
## 二级商户号
|
## 二级商户号
|
||||||
merchantNo: 153428607006
|
merchantNo: 153428607006
|
||||||
|
@ -138,9 +138,9 @@ jd:
|
||||||
refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
|
refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
|
||||||
separateAccounts:
|
separateAccounts:
|
||||||
- account: 153428607008
|
- account: 153428607008
|
||||||
proportion: 0.5
|
proportion: 0.7
|
||||||
- account: 153428607006
|
- account: 153428607006
|
||||||
proportion: 0.5
|
proportion: 0.3
|
||||||
transfer-out:
|
transfer-out:
|
||||||
## 二级商户号
|
## 二级商户号
|
||||||
merchantNo: 153428607004
|
merchantNo: 153428607004
|
||||||
|
|
Loading…
Reference in New Issue