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

Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Guoqs
2025-08-05 15:08:32 +08:00
parent e00abccca8 d751f8efbe
commit de23d9ad34
5 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -132,6 +132,12 @@ public class OrderBasicInfoController extends BaseController {
orderBasicInfo.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
}
List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoListWithAuth(orderBasicInfo);
// 将结算金额改为实收金额
if (CollectionUtils.isNotEmpty(list)) {
for (OrderListVO orderListVO : list) {
orderListVO.setSettleAmount(String.valueOf(orderListVO.getActualReceivedAmount()));
}
}
ExcelUtil<OrderListVO> util = new ExcelUtil<OrderListVO>(OrderListVO.class);
util.exportExcel(response, list, "订单数据");
}