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/ProjUseController.java | 112 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
index 375256d..f50de16 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
@@ -12,20 +12,17 @@
import com.matrix.core.tools.excl.ExcelUtil;
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.ShoppingGoods;
-import com.matrix.system.hive.bean.SysProjUse;
-import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysProjUseDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
-import com.matrix.system.hive.plugin.message.StringUtil;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.hive.service.SysProjuseFreezeService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,6 +57,25 @@
@Resource
private MoneyCardUseService moneyCardUseService;
+ @Resource
+ private SysProjUseDao projUseDao;
+
+ @Autowired
+ SysVipInfoDao vipInfoDao;
+
+ @Autowired
+ ShoppingGoodsDao shoppingGoodsDao;
+
+ @Autowired
+ MoneyCardUseDao moneyCardUseDao;
+
+ @Value("${default.vip.photo.woman}")
+ String defaultWoman;
+
+ @Value("${default.vip.photo.man}")
+ String defaultman;
+
+
public static final String fnCode = "projUse";
public static final String search = fnCode + ":search";
@@ -85,6 +101,18 @@
projUseService.findInPage(sysProjUse, pageVo), projUseService.findTotal(sysProjUse));
}
+ /**
+ * 查看会员项目使用情况
+ *
+ * @author jiangyouyao
+ * @date 2016-09-03
+ */
+ @RequestMapping(value = "/findProjUseFlow")
+ public @ResponseBody
+ AjaxResult findProjUseFlow(PaginationVO pageVo, SysProjUseFlow projUseFlow) {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS,
+ projUseDao.selectProjUseFlow(projUseFlow, pageVo), projUseDao.selectProjUseFlowTotal(projUseFlow));
+ }
/**
* 将项目设置为有效
@@ -139,21 +167,7 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "项目转让失败");
}
- @RequestMapping(value = "/returnProj")
- public @ResponseBody
- AjaxResult returnTc(SysProjUse sysProjUse, Long moneyCardUseId, String tcRemark, Long shopId, Double money, String tcName) {
- MoneyCardUse card = null;
- if (moneyCardUseId != null) {
- card = moneyCardUseService.findById(moneyCardUseId);
- }
- int i = projUseService.returnMoneyProj(sysProjUse, card, moneyCardUseId);
- if (i > 0) {
-
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "退款成功");
- }
- return new AjaxResult(AjaxResult.STATUS_FAIL, "退款失败");
- }
/**
@@ -174,31 +188,6 @@
}
- /**
- * 退款
- *
- * @return
- */
- @RequestMapping(value = "/getEffectCard")
- public @ResponseBody
- AjaxResult getEffectCard(SysProjUse sysProjUse) {
- MoneyCardUse cardUse = moneyCardUseService.findByVipId(sysProjUse.getVipId());
- double money = projUseService.getTotalMoneyProj(sysProjUse);
- if (cardUse != null) {
- cardUse.setRealMoney(money);
- List<MoneyCardUse> list = new ArrayList<MoneyCardUse>();
- list.add(cardUse);
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, null, "有有效会籍卡", list, null);
- } else {
- //无会员卡则new一个，为了把钱传递到前台
- cardUse = new MoneyCardUse();
- cardUse.setRealMoney(money);
- List<MoneyCardUse> list = new ArrayList<MoneyCardUse>();
- list.add(cardUse);
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, null, "无有效会籍卡", list, null);
- }
-
- }
/**
* 冻结会员项目
@@ -217,10 +206,29 @@
/**
* 添加或修改会员項目信息
*/
+ @Transactional
@RequestMapping(value = "/addOrModify")
public @ResponseBody
AjaxResult addOrModify(SysProjUse sysProjUse) {
if (sysProjUse.getId() != null) {
+ SysUsers user=getMe();
+ //插入修改记录
+ SysProjUse oldProjUse = projUseService.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);
+
return modify(projUseService, sysProjUse, "项目");
} else {
return add(projUseService, sysProjUse, "项目");
@@ -228,17 +236,7 @@
}
- @Autowired
- SysVipInfoDao vipInfoDao;
- @Autowired
- ShoppingGoodsDao shoppingGoodsDao;
-
- @Autowired
- SysProjUseDao projUseDao;
-
- @Autowired
- MoneyCardUseDao moneyCardUseDao;
@RequestMapping(value = "/importProjUse")
@@ -324,11 +322,12 @@
Object tel = objects.get(1);
if (tel != null) {
String telStr = tel.toString();
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(telStr);
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(telStr,sysUsers.getCompanyId());
if (vipInfo == null) {
vipInfo = new SysVipInfo();
vipInfo.setShopId(sysUsers.getShopId());
vipInfo.setPhone(telStr);
+ vipInfo.setPhoto(defaultWoman);
vipInfo.setName(objects.get(0).toString());
vipInfoDao.insert(vipInfo);
}
@@ -380,11 +379,12 @@
Object tel = objects.get(1);
if (tel != null) {
String telStr = tel.toString();
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(telStr);
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(telStr,sysUsers.getCompanyId());
if (vipInfo == null) {
vipInfo = new SysVipInfo();
vipInfo.setShopId(sysUsers.getShopId());
vipInfo.setPhone(telStr);
+ vipInfo.setPhoto(defaultWoman);
vipInfo.setName(objects.get(0).toString());
vipInfoDao.insert(vipInfo);
}
--
Gitblit v1.9.1