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

修改订单报表 汇总数据

Browse Source
This commit is contained in:
Lemon
2023-06-17 15:00:04 +08:00
parent 8ba2752f10
commit d18b9a3c48
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java
View File

@@ -95,7 +95,7 @@ public class SettleOrderReportController extends BaseController {
* @param dto * @param dto
* @return * @return
*/ */
@PreAuthorize("@ss.hasPermi('pile:report:query')") @PreAuthorize("@ss.hasPermi('pile:merchant:query')")
@PostMapping("/getMerchantOrderReport") @PostMapping("/getMerchantOrderReport")
public AjaxResult getMerchantOrderReport(@RequestBody MerchantOrderReportDTO dto) { public AjaxResult getMerchantOrderReport(@RequestBody MerchantOrderReportDTO dto) {
return AjaxResult.success(settleOrderReportService.getMerchantOrderReport(dto)); return AjaxResult.success(settleOrderReportService.getMerchantOrderReport(dto));

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -117,11 +117,12 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
MerchantOrderReportVO vo = new MerchantOrderReportVO(); MerchantOrderReportVO vo = new MerchantOrderReportVO();
MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport(); MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();
PageUtils.startPage(pageNum, pageSize); PageUtils.startPage(pageNum, pageSize);
List<SettleOrderReportVO> list = settleOrderReportMapper.getMerchantOrderReport(dto); List<SettleOrderReportVO> pageList = settleOrderReportMapper.getMerchantOrderReport(dto);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(pageList)) {
return null; return null;
} }
PageInfo<SettleOrderReportVO> pageInfo = new PageInfo<>(list); List<SettleOrderReportVO> list = settleOrderReportMapper.getMerchantOrderReport(dto);
PageInfo<SettleOrderReportVO> pageInfo = new PageInfo<>(pageList);
vo.setMerchantId(dto.getMerchantId()); vo.setMerchantId(dto.getMerchantId());
// vo.setReportList(pageInfo.getList()); // vo.setReportList(pageInfo.getList());

2
jsowell-ui/src/views/pile/merchant/components/revenue.vue
View File

@@ -10,7 +10,7 @@
<el-descriptions-item label="服务费金额">{{merchantOrderReport.serviceAmount}}元</el-descriptions-item> <el-descriptions-item label="服务费金额">{{merchantOrderReport.serviceAmount}}元</el-descriptions-item>
<el-descriptions-item label="收入金额">{{merchantOrderReport.totalAmount}}元</el-descriptions-item> <el-descriptions-item label="收入金额">{{merchantOrderReport.totalAmount}}元</el-descriptions-item>
<el-descriptions-item label="交易金额">{{merchantOrderReport.tradeAmount}}元</el-descriptions-item> <el-descriptions-item label="交易金额">{{merchantOrderReport.tradeAmount}}元</el-descriptions-item>
<el-descriptions-item label="交易手续费">{{merchantOrderReport.tradeFee}}</el-descriptions-item> <el-descriptions-item label="交易手续费">{{merchantOrderReport.tradeFee}}元</el-descriptions-item>
<el-descriptions-item label="虚拟金额">{{merchantOrderReport.virtualAmount}}元</el-descriptions-item> <el-descriptions-item label="虚拟金额">{{merchantOrderReport.virtualAmount}}元</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>