autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +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:
autumn.g@foxmail.com
2023-08-31 10:30:12 +08:00
parent 2138eeaad0 73b203dd44
commit acff945822
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1186,8 +1186,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
List<Map<String, Object>> list = calculateUnfreezeAmount(orderAmount, payRecordList);
for (Map<String, Object> map : list) {
String paymentId = (String) map.get("paymentId");
String unfreezeAmount = (String) map.get("unfreezeAmount");
memberAdapayRecordService.unfreezeAmount(paymentId, new BigDecimal(unfreezeAmount));
BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount");
memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount);
}
}

1
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -84,6 +84,7 @@ public class OrderDetailInfoVO {
@Data
public static class OrderRealTimeInfo{
private String time;
private String orderAmount; // 订单金额
private String totalElectricityAmount; // 总电费
private String totalServiceAmount; // 总服务费