From 2e3c12ca3a7241f498c32121cb1572502c998d0d Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 09 Jan 2021 00:42:00 +0800
Subject: [PATCH] 公众号模板消息demo

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 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 63e7d10..b9db73c 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
@@ -13,6 +13,7 @@
 import com.matrix.system.app.vo.VipInfoListVo;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.common.tools.PasswordUtil;
 import com.matrix.system.common.tools.ServiceUtil;
 import com.matrix.system.constance.Dictionary;
 import com.matrix.system.constance.TableMapping;
@@ -447,6 +448,7 @@
 		}
 
 		SysVipInfo vipInfo = new SysVipInfo();
+		vipInfo.setPhoto(addVipDto.getPhoto());
 		vipInfo.setVipName(addVipDto.getVipName());
 		vipInfo.setVipNo(addVipDto.getVipNo());
 		vipInfo.setSex(addVipDto.getSex());
@@ -455,10 +457,11 @@
 		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())) {
-			String[] areas = addVipDto.getAreas().split(",");
+			String[] areas = addVipDto.getAreas().split("-");
 			vipInfo.setProvince(areas[0]);
 			vipInfo.setCity(areas[1]);
 			vipInfo.setArea(areas[2]);
@@ -491,18 +494,27 @@
 	public int apiModifyVip(ModifyVipDto modifyVipDto) {
 		SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
 
-		if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", modifyVipDto.getPhone(),
-				"company_id",user.getCompanyId() )) {
-			throw new GlobleException("手机已被注册!");
-		}
-
 		SysVipInfo vipInfo = sysVipInfoDao.selectById(modifyVipDto.getVipId());
 		if (vipInfo == null) {
 			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 (!vipInfo.getPhone().equals(modifyVipDto.getPhone())) {
+			if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", modifyVipDto.getPhone(),
+					"company_id", user.getCompanyId())) {
+				throw new GlobleException("手机已被注册!");
+			}
+		}
+
 		if (StringUtils.isNotBlank(modifyVipDto.getAreas())) {
-			String[] areas = modifyVipDto.getAreas().split(",");
+			String[] areas = modifyVipDto.getAreas().split("-");
 			vipInfo.setProvince(areas[0]);
 			vipInfo.setCity(areas[1]);
 			vipInfo.setArea(areas[2]);
@@ -514,8 +526,10 @@
 		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())) {
@@ -559,6 +573,8 @@
 		vipInfoDetailVo.setArea(sysVipInfo.getArea());
 		vipInfoDetailVo.setRemark(sysVipInfo.getRemark());
 		vipInfoDetailVo.setBirthday(sysVipInfo.getBirthday1());
+		vipInfoDetailVo.setPassword(sysVipInfo.getPassWord());
+		vipInfoDetailVo.setPhoto(sysVipInfo.getPhoto());
 
 		List<SysVipLabel> labels = sysVipLabelDao.selectByVipId(sysVipInfo.getId());
 		vipInfoDetailVo.setLabels(labels);

--
Gitblit v1.9.1