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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-09-25 15:59:51 +08:00
parent c7691993c7 dac7296ac3
commit 34689acd73
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -494,9 +494,9 @@ public class SpringBootTestController {
public void queryPaymentConfirmListTest() { public void queryPaymentConfirmListTest() {
QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO(); QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO();
dto.setWechatAppId("wxbb3e0d474569481d"); dto.setWechatAppId("wxbb3e0d474569481d");
dto.setPaymentId("002212023081712452810538109291674042368"); dto.setPaymentId("002212023090917453610546519740849975296");
QueryPaymentConfirmDetailResponse queryPaymentConfirmDetailResponse = adapayService.queryPaymentConfirmList(dto); QueryPaymentConfirmDetailResponse queryPaymentConfirmDetailResponse = adapayService.queryPaymentConfirmList(dto);
System.out.println(queryPaymentConfirmDetailResponse); System.out.println(JSON.toJSONString(queryPaymentConfirmDetailResponse));
} }
@Test @Test

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

@@ -1558,7 +1558,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
JSONObject jsonObject = JSON.parseObject(confirm.getDescription()); JSONObject jsonObject = JSON.parseObject(confirm.getDescription());
if (StringUtils.equals(jsonObject.getString("orderCode"), orderCode)) { if (StringUtils.equals(jsonObject.getString("orderCode"), orderCode)) {
// 订单号对的上，累计分账金额 // 订单号对的上，累计分账金额
confirmAmt = confirmAmt.add(new BigDecimal(confirm.getConfirmAmt())); confirmAmt = confirmAmt.add(new BigDecimal(confirm.getConfirmedAmt()));
feeAmt = feeAmt.add(new BigDecimal(confirm.getFeeAmt())); feeAmt = feeAmt.add(new BigDecimal(confirm.getFeeAmt()));
} }
} }