From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java
index e221d43..ded5549 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java
@@ -65,7 +65,7 @@
List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,null);
//设置套餐中的项目
projUseList.forEach(taocanProjUse -> {
- taocanProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(taocanProjUse.getId()));
+ taocanProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(taocanProjUse.getId(),sysProjUse.getStatus()));
});
return new AjaxResult(AjaxResult.STATUS_SUCCESS, projUseList, sysProjUseService.findTotal(sysProjUse));
}
@@ -123,21 +123,7 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "套餐转让失败");
}
- @RequestMapping(value = "/returnTc")
- public @ResponseBody
- AjaxResult returnTc(SysProjUse sysProjUse, Long moneyCardUseId, String tcRemark, Long shopId, Double money, String tcName) {
- System.out.println("moneyCardUseId = " + moneyCardUseId);
- MoneyCardUse card = moneyCardUseService.findById(moneyCardUseId);
- System.out.println("card = " + card);
- int i = sysProjUseService.returnMoneyTc(sysProjUse, card, moneyCardUseId);
- if (i > 0) {
-
-
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "退款成功");
- }
- return new AjaxResult(AjaxResult.STATUS_FAIL, "退款失败");
- }
/**
@@ -158,11 +144,7 @@
}
- /**
- * 退款
- *
- * @return
- */
+
@RequestMapping(value = "/getEffectCard")
public @ResponseBody
AjaxResult getEffectCard(SysProjUse sysProjUse) {
@@ -194,7 +176,7 @@
public String editForm(Long id) {
if (id != null) {
SysProjUse sysProjUse = sysProjUseService.findById(id);
- sysProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(sysProjUse.getId()));
+ sysProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(sysProjUse.getId(), sysProjUse.getStatus()));
WebUtil.getRequest().setAttribute("obj", sysProjUse);
}
return "admin/hive/vip/tc-form";
--
Gitblit v1.9.1