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

update 解析扣款记录bug

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-12 15:35:45 +08:00
parent 7fd344f194
commit e921406d95
2 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java
View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.service.orderlogic; package com.jsowell.pile.service.orderlogic;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@@ -414,9 +415,13 @@ public abstract class AbstractOrderLogic implements InitializingBean {
BigDecimal tempAmount = new BigDecimal(orderAmount.toString()); // 临时金额 BigDecimal tempAmount = new BigDecimal(orderAmount.toString()); // 临时金额
for (OrderPayRecord record : payRecordList) { for (OrderPayRecord record : payRecordList) {
JSONObject jsonObject = JSON.parseObject(record.getDeductionRecord()); // String deductionRecord = record.getDeductionRecord();
String paymentId = jsonObject.getString("paymentId"); // JSONObject jsonObject = JSON.parseObject(deductionRecord);
BigDecimal payAmount = record.getPayAmount(); // 此交易单支付的金额
List<JSONObject> jsonObjects = parseDeductionRecord(record.getDeductionRecord());
for (JSONObject object : jsonObjects) {
String paymentId = object.getString("paymentId");
BigDecimal payAmount = object.getBigDecimal("amount"); // 此交易单支付的金额
// 该笔支付扣除金额 // 该笔支付扣除金额
BigDecimal deductionAmount; BigDecimal deductionAmount;
// 该笔支付解冻金额 // 该笔支付解冻金额
@@ -442,6 +447,28 @@ public abstract class AbstractOrderLogic implements InitializingBean {
break; break;
} }
} }
}
return resultList;
}
/**
* 解析deductionRecord
* 【公共方法】
*/
protected List<JSONObject> parseDeductionRecord(String deductionRecord) {
List<JSONObject> resultList = Lists.newArrayList();
if (StringUtils.isBlank(deductionRecord)) {
return resultList;
}
Object object = JSON.parse(deductionRecord);
// 都放入list里
if (object instanceof JSONArray) {
resultList.addAll(((JSONArray) object).toList(JSONObject.class));
} else {
resultList.add((JSONObject) object);
}
return resultList; return resultList;
} }

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

@@ -280,16 +280,18 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
// 把消费金额冻结 // 把消费金额冻结
for (OrderPayRecord record : payRecordList) { for (OrderPayRecord record : payRecordList) {
String deductionRecord = record.getDeductionRecord(); // String deductionRecord = record.getDeductionRecord();
Object object = JSON.parse(deductionRecord); // Object object = JSON.parse(deductionRecord);
//
// // 都放入list里
// List<JSONObject> arr = Lists.newArrayList();
// if (object instanceof JSONArray) {
// arr.addAll(((JSONArray) object).toList(JSONObject.class));
// } else {
// arr.add((JSONObject) object);
// }
// 都放入list里 List<JSONObject> arr = parseDeductionRecord(record.getDeductionRecord());
List<JSONObject> arr = Lists.newArrayList();
if (object instanceof JSONArray) {
arr.addAll(((JSONArray) object).toList(JSONObject.class));
} else {
arr.add((JSONObject) object);
}
// 循环冻结金额 // 循环冻结金额
for (JSONObject jsonObject : arr) { for (JSONObject jsonObject : arr) {