From 8fe37f0f7af3667b60e0f29a1ce8188c08c35bb1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Mar 2021 15:33:34 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 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 607821c..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
@@ -3,9 +3,11 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.MoneyCardUse;
import com.matrix.system.hive.bean.SysProjUse;
+import com.matrix.system.hive.bean.SysProjUseFlow;
import com.matrix.system.hive.dao.SysProjUseDao;
import com.matrix.system.hive.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysProjUseService;
@@ -63,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));
}
@@ -121,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, "退款失败");
- }
/**
@@ -156,11 +144,7 @@
}
- /**
- * 退款
- *
- * @return
- */
+
@RequestMapping(value = "/getEffectCard")
public @ResponseBody
AjaxResult getEffectCard(SysProjUse sysProjUse) {
@@ -192,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";
@@ -205,6 +189,27 @@
public @ResponseBody
AjaxResult addOrModify(SysProjUse sysProjUse) {
if (sysProjUse.getId() != null) {
+
+ //插入修改记录
+ SysUsers user=getMe();
+ //插入修改记录
+ SysProjUse oldProjUse = sysProjUseService.findById(sysProjUse.getId());
+ SysProjUseFlow projUseFlow=new SysProjUseFlow();
+ projUseFlow.setProjUseId(sysProjUse.getId());
+ projUseFlow.setOptionType("人工修改");
+ projUseFlow.setProjName(oldProjUse.getProjName());
+ projUseFlow.setCreateBy(user.getSuName());
+ projUseFlow.setUpdateBy(user.getSuName());
+ projUseFlow.setPrice(sysProjUse.getPrice());
+ projUseFlow.setStatus(sysProjUse.getStatus());
+ projUseFlow.setBalance(sysProjUse.getBalance());
+ projUseFlow.setFailTime(sysProjUse.getFailTime());
+ projUseFlow.setIsOver(sysProjUse.getIsOver());
+ projUseFlow.setRemark(sysProjUse.getUpdateRemark());
+ projUseFlow.setSurplusCount(sysProjUse.getSurplusCount());
+ projUseDao.insertFlow(projUseFlow);
+
+
int modifyResult = sysProjUseService.modify(sysProjUse);
List<SysProjUse> modifyUse = sysProjUse.getTaocanProjUse();
@@ -212,6 +217,25 @@
if (modifyResult > 0) {
if (CollectionUtils.isNotEmpty(modifyUse)) {
for (SysProjUse use : modifyUse) {
+
+ //插入修改记录
+ SysProjUse oldProjUse2 = sysProjUseService.findById(use.getId());
+ SysProjUseFlow projUseFlow2=new SysProjUseFlow();
+ //套餐中的项目需要记录套餐id
+ projUseFlow2.setProjUseId(oldProjUse.getId());
+ projUseFlow2.setOptionType("人工修改");
+ projUseFlow2.setProjName(oldProjUse2.getProjName());
+ projUseFlow2.setCreateBy(user.getSuName());
+ projUseFlow2.setUpdateBy(user.getSuName());
+ projUseFlow2.setPrice(use.getPrice());
+ projUseFlow2.setStatus(use.getStatus());
+ projUseFlow2.setBalance(use.getBalance());
+ projUseFlow2.setFailTime(use.getFailTime());
+ projUseFlow2.setIsOver(use.getIsOver());
+ projUseFlow2.setRemark(sysProjUse.getUpdateRemark());
+ projUseFlow2.setSurplusCount(use.getSurplusCount());
+ projUseDao.insertFlow(projUseFlow2);
+
sysProjUseService.modify(use);
}
}
--
Gitblit v1.9.1