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

查询站点订单日报详情

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 09:42:30 +08:00
parent 0bbde0245d
commit 36fe313a82
22 changed files with 321 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -369,9 +369,7 @@ public class MemberService {
.list(collect)
.pages(pages)
.total(total)
.build();
vo.setPageResponse(pageResponse);
log.info("查询用户余额信息 service方法 end");
return vo;

6
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -405,7 +405,9 @@ public class OrderService {
}
// 支付流水
List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
List<OrderDetailInfoVO.PayRecord> payRecords = orderPayRecordService.selectOrderPayInfoList(orderCode);
vo.setPayRecordList(payRecords);
/*List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
if (CollectionUtils.isNotEmpty(orderPayRecordList)) {
List<OrderDetailInfoVO.PayRecord> payRecordList = Lists.newArrayList();
for (OrderPayRecord orderPayRecord : orderPayRecordList) {
@@ -466,7 +468,7 @@ public class OrderService {
payRecordList.add(payInfo);
}
vo.setPayRecordList(payRecordList);
}
}*/
// 查询退款明细
List<OrderDetailInfoVO.OrderRefundInfo> orderRefundInfoList = Lists.newArrayList();

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

@@ -1,5 +1,6 @@
package com.jsowell.web.controller.pile;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
@@ -8,7 +9,9 @@ import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.service.ISettleOrderReportService;
import com.jsowell.pile.vo.web.OrderSettleDetailVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -100,4 +103,16 @@ public class SettleOrderReportController extends BaseController {
public AjaxResult getMerchantOrderReport(@RequestBody MerchantOrderReportDTO dto) {
return AjaxResult.success(settleOrderReportService.getMerchantOrderReport(dto));
}
/**
* 查询站点订单日报详情
* http://localhost:8080/order/report/getStationOrderReportDetail
*/
@Anonymous
@PostMapping("/getStationOrderReportDetail")
public TableDataInfo getStationOrderReportDetail(@RequestBody SettleOrderReportDTO dto) {
// startPage();
List<OrderSettleDetailVO> orderSettleDetailVOS = settleOrderReportService.selectSettleOrderReportDetail(dto);
return getDataTable(orderSettleDetailVOS);
}
}