From 38072cc8650d65b1f229bb0160909421fbbfde07 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 07 Mar 2021 20:40:20 +0800
Subject: [PATCH] 修改数据库
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index d75f8f2..922b7d9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -16,12 +16,14 @@
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.VipInfoVo;
import com.matrix.system.hive.service.SysVipInfoService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -58,13 +60,21 @@
@Autowired
private SysVipLabelDao sysVipLabelDao;
+ @Value("${default.vip.photo.woman}")
+ String defaultWoman;
+
+ @Value("${default.vip.photo.man}")
+ String defaultMan;
+
+
+
/**
* 新增会员储值卡
* @param vipId
* @return
*/
@Override
- public int addVipDefaultCard(Long vipId){
+ public MoneyCardUse addVipDefaultCard(Long vipId){
MoneyCardUse defaultCardUse=new MoneyCardUse();
defaultCardUse.setVipId(vipId);
defaultCardUse.setCardName("储值卡");
@@ -73,7 +83,8 @@
defaultCardUse.setGiftMoney(0D);
defaultCardUse.setSource("-");
defaultCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
- return moneyCardUseDao.insert(defaultCardUse);
+ moneyCardUseDao.insert(defaultCardUse);
+ return defaultCardUse;
}
@@ -104,6 +115,11 @@
sysVipInfo.setPointAll(0);
sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
sysVipInfo.setZjm(StringUtils.toHanyuPinyin(sysVipInfo.getVipName())+","+StringUtils.toHeadWordHanyuPinyin(sysVipInfo.getVipName()));
+ if(sysVipInfo.getSex().equals(Dictionary.SEX_MAN)){
+ sysVipInfo.setPhoto(defaultMan);
+ }else{
+ sysVipInfo.setPhoto(defaultWoman);
+ }
int i=sysVipInfoDao.insert(sysVipInfo);
modifyVipWithOtherInfo(sysVipInfo);
//创建用户默认储值卡
@@ -197,8 +213,7 @@
@Override
public List<SysVipInfo> findByVipNoOrTel(String key) {
- SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- return sysVipInfoDao.selectByVipNoOrTel(key, users.getShopId());
+ return sysVipInfoDao.selectByVipNoOrTel(key);
}
@@ -279,8 +294,8 @@
@Override
public List<SysVipInfo> findUserByKey(String keyWord) {
- SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- return sysVipInfoDao.selectUserByKey(keyWord, users.getShopId());
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ return sysVipInfoDao.selectUserByKey(keyWord,user.getCompanyId());
}
@@ -336,6 +351,11 @@
SysUsers users = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
sysVipInfo.setCompanyId(users.getCompanyId());
sysVipInfo.setShopId(users.getShopId());
+ if(sysVipInfo.getSex().equals(Dictionary.SEX_MAN)){
+ sysVipInfo.setPhoto(defaultMan);
+ }else{
+ sysVipInfo.setPhoto(defaultWoman);
+ }
int i=sysVipInfoDao.insert(sysVipInfo);
modifyVipWithOtherInfo(sysVipInfo);
return i;
@@ -424,6 +444,7 @@
if (!DataAuthUtil.hasAllShopAuth()) {
vipInfoListDto.setShopId(sysUsers.getShopId());
}
+ QueryUtil.setQueryLimitCom(vipInfoListDto);
return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
}
@@ -436,9 +457,11 @@
public int apiAddVip(AddVipDto addVipDto) {
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", addVipDto.getVipNo(),
- "company_id",user.getCompanyId())) {
- throw new GlobleException("编号已存在!");
+ if (StringUtils.isNotBlank(addVipDto.getVipNo())) {
+ if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", addVipDto.getVipNo(),
+ "company_id", user.getCompanyId())) {
+ throw new GlobleException("编号已存在!");
+ }
}
if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", addVipDto.getPhone(),
@@ -447,6 +470,8 @@
}
SysVipInfo vipInfo = new SysVipInfo();
+
+ vipInfo.setPhoto(addVipDto.getPhoto());
vipInfo.setVipName(addVipDto.getVipName());
vipInfo.setVipNo(addVipDto.getVipNo());
vipInfo.setSex(addVipDto.getSex());
@@ -455,6 +480,7 @@
vipInfo.setAddr(addVipDto.getAddress());
vipInfo.setRemark(addVipDto.getRemark());
vipInfo.setBirthday1(addVipDto.getBirthday());
+ vipInfo.setPassWord(addVipDto.getPassword());
vipInfo.setRecommendId(addVipDto.getRecommendId());
if (StringUtils.isNotBlank(addVipDto.getAreas())) {
@@ -476,10 +502,15 @@
vipInfo.setPointAll(0);
vipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
vipInfo.setZjm(StringUtils.toHanyuPinyin(vipInfo.getVipName())+","+StringUtils.toHeadWordHanyuPinyin(vipInfo.getVipName()));
+ if(vipInfo.getSex().equals(Dictionary.SEX_MAN)){
+ vipInfo.setPhoto(defaultMan);
+ }else{
+ vipInfo.setPhoto(defaultWoman);
+ }
int i=sysVipInfoDao.insert(vipInfo);
if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {
- batchInsertLabel(addVipDto.getLabels(), user.getSuName(), vipInfo.getId());
+ batchInsertLabel(addVipDto.getLabels(), vipInfo.getId());
}
//创建用户默认储值卡
@@ -496,10 +527,12 @@
throw new GlobleException("用户不存在");
}
- if (!modifyVipDto.getVipNo().equals(vipInfo.getVipNo())) {
- if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", modifyVipDto.getVipNo(),
- "company_id",user.getCompanyId())) {
- throw new GlobleException("编号已存在!");
+ if (StringUtils.isNotBlank(modifyVipDto.getVipNo())) {
+ if (!modifyVipDto.getVipNo().equals(vipInfo.getVipNo())) {
+ if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", modifyVipDto.getVipNo(),
+ "company_id", user.getCompanyId())) {
+ throw new GlobleException("编号已存在!");
+ }
}
}
@@ -523,28 +556,27 @@
vipInfo.setPhone(modifyVipDto.getPhone());
vipInfo.setAddr(modifyVipDto.getAddress());
vipInfo.setRemark(modifyVipDto.getRemark());
+ vipInfo.setPassWord(modifyVipDto.getPassword());
vipInfo.setBirthday1(modifyVipDto.getBirthday());
vipInfo.setRecommendId(modifyVipDto.getRecommendId());
+ vipInfo.setPhoto(modifyVipDto.getPhoto());
int i = sysVipInfoDao.update(vipInfo);
if (CollectionUtils.isNotEmpty(modifyVipDto.getLabels())) {
- sysVipLabelDao.deleteByVipId(modifyVipDto.getVipId());
-
- batchInsertLabel(modifyVipDto.getLabels(), user.getSuName(), vipInfo.getId());
+ sysVipLabelDao.deleteRelateByVipId(modifyVipDto.getVipId());
+ batchInsertLabel(modifyVipDto.getLabels(), vipInfo.getId());
}
return i;
}
- private void batchInsertLabel(List<String> labelList, String suName, Long id) {
+ private void batchInsertLabel(List<String> labelList, Long id) {
Set<String> labels = new HashSet<>(labelList);
Iterator<String> iterator = labels.iterator();
- if (iterator.hasNext()) {
- SysVipLabel sysVipLabel = new SysVipLabel();
- sysVipLabel.setCreateTime(new Date());
- sysVipLabel.setCreateBy(suName);
- sysVipLabel.setLabel(iterator.next());
- sysVipLabel.setVipId(id);
- sysVipLabelDao.insert(sysVipLabel);
+ while (iterator.hasNext()) {
+ SysVipLabelRelate relate = new SysVipLabelRelate();
+ relate.setLabelId(Long.parseLong(iterator.next()));
+ relate.setVipId(id);
+ sysVipLabelDao.insertRelate(relate);
}
}
@@ -568,6 +600,9 @@
vipInfoDetailVo.setArea(sysVipInfo.getArea());
vipInfoDetailVo.setRemark(sysVipInfo.getRemark());
vipInfoDetailVo.setBirthday(sysVipInfo.getBirthday1());
+ vipInfoDetailVo.setPassword(sysVipInfo.getPassWord());
+ vipInfoDetailVo.setPhoto(sysVipInfo.getPhoto());
+ vipInfoDetailVo.setVipNo(sysVipInfo.getVipNo());
List<SysVipLabel> labels = sysVipLabelDao.selectByVipId(sysVipInfo.getId());
vipInfoDetailVo.setLabels(labels);
--
Gitblit v1.9.1