l1450637472/dzpt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix：对账完成

Browse Source
This commit is contained in:
Yuan
2025-12-07 11:46:49 +08:00
parent 3f931c2e29
commit 66620d51ae
23 changed files with 664 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/saye/hospitalgd/controller/FinancialReconciliation/RefundStatisticsController.java
View File

@@ -62,13 +62,17 @@ public class RefundStatisticsController {
modelMap.addAttribute("startTime", startTime);
modelMap.addAttribute("endTime", endTime);
//支付方式
List<Dicinfo> payType = dicinfoService.findDicinfoTreeNodeList("PAY_TYPE");
modelMap.addAttribute("payTypeList", payType);
//支付方式
List<Dicinfo> payType = dicinfoService.findDicinfoTreeNodeList("PAY_TYPE");
modelMap.addAttribute("payTypeList", payType);
//退款类型
List<Dicinfo> refundType = dicinfoService.findDicinfoTreeNodeList("REFUND_TYPE");
modelMap.addAttribute("refundTypeList", refundType);
//退款类型
List<Dicinfo> refundType = dicinfoService.findDicinfoTreeNodeList("REFUND_TYPE");
modelMap.addAttribute("refundTypeList", refundType);
//业务类型
List<Dicinfo> bizType = dicinfoService.findDicinfoTreeNodeList("BIZ_TYPE");
modelMap.addAttribute("bizTypeList", bizType);
} catch (Exception e) {
e.printStackTrace();
@@ -89,6 +93,7 @@ public class RefundStatisticsController {
@ApiParam("开始时间") String startTime,
@ApiParam("结束时间") String endTime,
@ApiParam("支付方式") String payType,
@ApiParam("业务类型") String bizType,
@ApiParam("退款类型") String refundType,
@ApiParam("统计维度") String dimension,
@ApiParam("页码") int page,
@@ -101,6 +106,7 @@ public class RefundStatisticsController {
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("payType", payType);
map.put("bizType", bizType);
map.put("refundType", refundType);
map.put("dimension", dimension);
@@ -133,6 +139,7 @@ public class RefundStatisticsController {
@ApiParam("开始时间") String startTime,
@ApiParam("结束时间") String endTime,
@ApiParam("支付方式") String payType,
@ApiParam("业务类型") String bizType,
@ApiParam("退款类型") String refundType) {
HashMap<Object, Object> responseMap = new HashMap<Object, Object>();
@@ -142,6 +149,7 @@ public class RefundStatisticsController {
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("payType", payType);
map.put("bizType", bizType);
map.put("refundType", refundType);
HashMap<Object, Object> summaryData = refundStatisticsService.getRefundSummary(map);
@@ -171,6 +179,7 @@ public class RefundStatisticsController {
@ApiParam("开始时间") String startTime,
@ApiParam("结束时间") String endTime,
@ApiParam("支付方式") String payType,
@ApiParam("业务类型") String bizType,
@ApiParam("退款类型") String refundType) {
HashMap<Object, Object> responseMap = new HashMap<Object, Object>();
@@ -180,6 +189,7 @@ public class RefundStatisticsController {
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("payType", payType);
map.put("bizType", bizType);
map.put("refundType", refundType);
List<HashMap<Object, Object>> trendData = refundStatisticsService.getRefundTrend(map);
@@ -209,6 +219,7 @@ public class RefundStatisticsController {
@ApiParam("开始时间") String startTime,
@ApiParam("结束时间") String endTime,
@ApiParam("支付方式") String payType,
@ApiParam("业务类型") String bizType,
@ApiParam("退款类型") String refundType,
@ApiParam("统计维度") String dimension) {
@@ -219,6 +230,7 @@ public class RefundStatisticsController {
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("payType", payType);
map.put("bizType", bizType);
map.put("refundType", refundType);
map.put("dimension", dimension);
@@ -236,5 +248,3 @@ public class RefundStatisticsController {
return responseMap;
}
}

5
src/main/java/com/saye/hospitalgd/controller/HisDetailController.java
View File

@@ -76,7 +76,9 @@ public class HisDetailController {
@ApiOperation(value = "查询his详细记录", notes = "")
@GetMapping("/findHisDetail")
@ResponseBody
public HashMap<Object, Object> findHisDetail(@ApiParam(value = "付款方式") String payType, String startTime, String endTime, String likeFiled, int page, int limit) {
public HashMap<Object, Object> findHisDetail(@ApiParam(value = "付款方式") String payType,
@ApiParam(value = "业务类型") String bizType,
String startTime, String endTime, String likeFiled, int page, int limit) {
HashMap<Object, Object> responseMap = new HashMap<>();
try {
@@ -85,6 +87,7 @@ public class HisDetailController {
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("likeFiled", likeFiled);
map.put("bizType", bizType);
PageHelper.startPage(page, limit);
PageInfo<HashMap<Object, Object>> pageInfo = new PageInfo<HashMap<Object, Object>>(hisDetailService.findHisDetail(map));

47
src/main/java/com/saye/hospitalgd/controller/PaymentStatisticsController.java
View File

@@ -9,6 +9,7 @@ import com.saye.hospitalgd.service.BankbillHistoryService;
import com.saye.hospitalgd.service.TransactionDetailService;
import com.saye.hospitalgd.service.system.DicinfoService;
import com.saye.hospitalgd.service.system.ServiceParamsService;
import com.saye.hospitalgd.service.FinancialReconciliation.TenpaySummaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -49,6 +50,9 @@ public class PaymentStatisticsController {
@Autowired
private ServiceParamsService serviceParamsService;
@Autowired
private TenpaySummaryService tenpaySummaryService;
@RequestMapping("/toPaymentStatistics")
public String toPaymentStatistics(ModelMap modelMap) {
return "paymentStatistics/paymentStatistics";
@@ -259,6 +263,27 @@ public class PaymentStatisticsController {
return "paymentStatistics/summary";
}
@RequestMapping("/toTenpaySummary")
@ApiOperation("财付通汇款汇总表")
public String toTenpaySummary(HttpServletRequest request, ModelMap modelMap) {
String trade_date = StringDUtil.changeNullToEmpty(request.getParameter("trade_date"));
if ("".equals(trade_date)) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.add(Calendar.DATE, -1);
Date startDate = calendar.getTime();
String startTime = DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, startDate);
String endTime = DateDUtil.getCurrentDate(DateDUtil.yyyy_MM_dd);
modelMap.addAttribute("startTime", startTime);
modelMap.addAttribute("endTime", endTime);
} else {
modelMap.addAttribute("startTime", trade_date);
modelMap.addAttribute("endTime", trade_date);
modelMap.addAttribute("isClick", "1");
}
return "paymentStatistics/tenpaySummary";
}
/**
* @description: 查询汇总表数据
* @author thuang
@@ -421,4 +446,26 @@ public class PaymentStatisticsController {
return resultMap;
}
@RequestMapping("/findTenpaySummary")
@ResponseBody
@ApiOperation("查询财付通汇款汇总数据")
public HashMap<Object, Object> findTenpaySummary(String startTime, String endTime) {
HashMap<Object, Object> response = new HashMap<>();
try {
HashMap<Object, Object> map = new HashMap<>();
map.put("startTime", startTime);
map.put("endTime", endTime);
List<HashMap<Object, Object>> bankList = tenpaySummaryService.findTenpayBankSummary(map);
List<HashMap<Object, Object>> hisList = tenpaySummaryService.findTenpayHisSummary(map);
response.put("code", 0);
response.put("msg", "OK");
response.put("bankData", bankList);
response.put("hisData", hisList);
} catch (Exception e) {
response.put("code", 1);
response.put("msg", e.getMessage());
}
return response;
}
}