From 6ee0c7abed78a110eacb8f2b92fece0d29bc2292 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 17:12:12 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java
index d61281c..ed9a805 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java
@@ -43,7 +43,7 @@
import java.util.stream.Collectors;
/**
- * 惠民卡控制器
+ * 玩湃惠民卡控制器
*
* @author fengshuonan
* @Date 2025-03-29 17:41:48
@@ -65,7 +65,7 @@
/**
- * 跳转到惠民卡首页
+ * 跳转到玩湃惠民卡首页
*/
@RequestMapping("")
public String index(Model model) {
@@ -88,7 +88,7 @@
}
/**
- * 跳转到添加惠民卡
+ * 跳转到添加玩湃惠民卡
*/
@RequestMapping("/tPayHuimin_add")
public String tPayHuiminAdd() {
@@ -96,7 +96,7 @@
}
/**
- * 获取惠民卡列表
+ * 获取玩湃惠民卡列表
*/
@RequestMapping(value = "/list")
@ResponseBody
@@ -142,6 +142,7 @@
records.forEach(item->{
item.setOperatorName(operatorMap.getOrDefault(item.getOperatorId(),""));
StringBuilder sb = new StringBuilder();
+ System.err.println("==========="+item);
Arrays.stream(item.getStoreIds().split(",")).map(Integer::parseInt).forEach(s->{
sb.append( storeMap.getOrDefault(s, ""));
sb.append(",");
@@ -162,6 +163,17 @@
@RequestMapping("/getStaticsData")
@ResponseBody
public ResultUtil<Map<String, BigDecimal>> getStaticsData(HuiminPayQuery query) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if (objectType.equals(2)){
+ //查询运营商
+ TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>()
+ .eq("userId", UserExt.getUser().getId())
+ .ne("state", 3)
+ .last("LIMIT 1"));
+ if (Objects.nonNull(operator)) {
+ query.setOperatorId(Long.valueOf(operator.getId()));
+ }
+ }
Map<String, BigDecimal> map = new HashMap<>();
map.put("totalAmount",BigDecimal.ZERO);
map.put("refundAmount",BigDecimal.ZERO);
@@ -191,7 +203,8 @@
@PostMapping("/refund")
@ResponseBody
public ResultUtil<?> refund(Integer id) {
- return payHuiminClient.refund(id);
+ payHuiminClient.refund(id);
+ return ResultUtil.success();
}
/**
@@ -222,7 +235,7 @@
item.setStoreName(sb.toString());
});
}
- String[] titleArr = {"惠民卡名称", "惠民卡类型", "售卖金额", "所属运营商", "可用门店", "购买用户", "联系电话", "购买时间", "绑定人员", "已用次数", "有效期", "状态"};
+ String[] titleArr = {"玩湃惠民卡名称", "玩湃惠民卡类型", "售卖金额", "所属运营商", "可用门店", "购买用户", "联系电话", "购买时间", "绑定人员", "已用次数", "有效期", "状态"};
String[][] values = new String[records.size()][];
for (int i = 0; i < records.size(); i++) {
SalesDetailVO salesDetailVO = records.get(i);
--
Gitblit v1.7.1