From d139016c6abfb03d2cbd5ade3d1fec84d5757deb Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 14 Sep 2021 15:13:36 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopProductAction.java | 26 +++++++------
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java | 38 +++++++++++++++----
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 30 ++++++---------
zq-erp/src/main/resources/config/application.properties | 12 +++---
4 files changed, 62 insertions(+), 44 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopProductAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopProductAction.java
index be2d489..b35a588 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopProductAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopProductAction.java
@@ -2,33 +2,32 @@
import com.alibaba.fastjson.JSON;
+import com.matrix.core.anotations.RemoveRequestToken;
+import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.constance.SystemMessageCode;
+import com.matrix.core.exception.GlobleException;
+import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.StringUtils;
-import com.matrix.core.constance.SystemErrorCode;
-import com.matrix.core.anotations.RemoveRequestToken;
+import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.tools.ServiceUtil;
-import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.shopXcx.bean.*;
import com.matrix.system.shopXcx.dao.*;
import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import com.matrix.core.exception.GlobleException;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.matrix.core.anotations.SaveRequestToken;
-import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.WebUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.*;
-
import org.springframework.web.servlet.ModelAndView;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* @description 产品表
@@ -171,7 +170,10 @@
shopProductParamRef.setUpdateBy(user.getSuName());
newShopProductParamRefs.add(shopProductParamRef);
}
- shopProductParamRefDao.batchInsert(newShopProductParamRefs);
+ if(CollectionUtils.isNotEmpty(newShopProductParamRefs)){
+
+ shopProductParamRefDao.batchInsert(newShopProductParamRefs);
+ }
}
return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, "产品表");
}else {
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java
index ba4c3ec..84755ba 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java
@@ -97,16 +97,38 @@
if (StringUtils.isBlank(bindingPhoneNumber.getPhoneNumber())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "手机号码不能为空");
}
- //验证通过将手机号加入相应的用户数据中
- SysVipInfo sysVipInfo = new SysVipInfo();
SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- sysVipInfo.setId(loginUser.getId());
- if(loginUser.getShopId()==null){
- sysVipInfo.setShopId(bindingPhoneNumber.getShopId());
+
+
+ SysVipInfo oldeUser = sysVipInfoDao.selectByPhone(bindingPhoneNumber.getPhoneNumber(), loginUser.getCompanyId());
+ if(oldeUser!=null){
+ oldeUser.setIsSales(loginUser.getIsSales());
+ oldeUser.setOpenId(loginUser.getOpenId());
+ oldeUser.setSessionKey(loginUser.getSessionKey());
+ oldeUser.setPhoto(loginUser.getAvatarUrl());
+ oldeUser.setAvatarUrl(loginUser.getAvatarUrl());
+ sysVipInfoDao.update(oldeUser);
+ sysVipInfoDao.deleteById(loginUser.getId());
+ String token = redisUserLoginUtils.saveUserInfo(oldeUser);
+ AjaxResult result = AjaxResult.buildSuccessInstance("绑定成功");
+ result.putInMap("token",token);
+ result.putInMap("userInfo",oldeUser);
+ return result;
+ }else{
+
+ //验证通过将手机号加入相应的用户数据中
+ SysVipInfo sysVipInfo = new SysVipInfo();
+
+ sysVipInfo.setId(loginUser.getId());
+ if(loginUser.getShopId()==null){
+ sysVipInfo.setShopId(bindingPhoneNumber.getShopId());
+ }
+ sysVipInfo.setPhone(bindingPhoneNumber.getPhoneNumber());
+ sysVipInfoDao.update(sysVipInfo);
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "绑定成功");
}
- sysVipInfo.setPhone(bindingPhoneNumber.getPhoneNumber());
- sysVipInfoDao.update(sysVipInfo);
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "绑定成功");
+
+
}
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
index 97af9ae..6abbed1 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
@@ -127,7 +127,7 @@
sysVipInfo.setVipNo(openId);
sysVipInfoService.add(sysVipInfo);
- }else{
+ } else {
sysVipInfo.setSessionKey(sessionKey);
sysVipInfoDao.update(sysVipInfo);
}
@@ -162,15 +162,15 @@
sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId()));
AjaxResult res = new AjaxResult();
res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId()));
- res.putInMap("prizeCount",activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(),loginUser.getCompanyId()));
+ res.putInMap("prizeCount", activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(), loginUser.getCompanyId()));
res.putInMap("userInfo", sysVipInfo);
//查询会员等级
- if(sysVipInfo.getSalesmanGrade()!=null){
+ if (sysVipInfo.getSalesmanGrade() != null) {
ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade());
res.putInMap("vipLevel", shopSalesmanGrade.getName());
- }else if(sysVipInfo.getVipLevel()!=null){
+ } else if (sysVipInfo.getVipLevel() != null) {
res.putInMap("vipLevel", sysVipInfo.getVipLevel().getLevelName());
- }else{
+ } else {
res.putInMap("vipLevel", "初级会员");
}
res.setStatus(AjaxResult.STATUS_SUCCESS);
@@ -184,7 +184,7 @@
public @ResponseBody
AjaxResult findUserInfo(@PathVariable String openId) {
SysVipInfo sysVipInfo = sysVipInfoService.findByOpenId(openId);
- SysVipInfo bizUserQuery=new SysVipInfo();
+ SysVipInfo bizUserQuery = new SysVipInfo();
bizUserQuery.setNickName(sysVipInfo.getNickName());
bizUserQuery.setAvatarUrl(sysVipInfo.getAvatarUrl());
bizUserQuery.setOpenId(openId);
@@ -200,16 +200,16 @@
AjaxResult saveUserInfo(@RequestBody XcxUserSaveUserInfoDto xcxUserSaveUserInfoDto) {
SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- SysVipInfo sysVipInfo=new SysVipInfo();
+ SysVipInfo sysVipInfo = new SysVipInfo();
sysVipInfo.setId(loginUser.getId());
- BeanUtil.copyProperties(xcxUserSaveUserInfoDto,sysVipInfo);
+ BeanUtil.copyProperties(xcxUserSaveUserInfoDto, sysVipInfo);
sysVipInfo.setPhone(xcxUserSaveUserInfoDto.getPhoneNumber());
- if(StringUtils.isBlank(loginUser.getVipName())||loginUser.getVipName().equals("微信用户")){
+ if (StringUtils.isBlank(loginUser.getVipName()) || loginUser.getVipName().equals("微信用户")) {
sysVipInfo.setVipName(xcxUserSaveUserInfoDto.getNickName());
}
- if(StringUtils.isBlank(loginUser.getSex())){
- sysVipInfo.setSex(xcxUserSaveUserInfoDto.getGender()==1?"男":"女");
+ if (StringUtils.isBlank(loginUser.getSex())) {
+ sysVipInfo.setSex(xcxUserSaveUserInfoDto.getGender() == 1 ? "男" : "女");
}
int i = sysVipInfoDao.update(sysVipInfo);
@@ -220,7 +220,6 @@
}
return new AjaxResult(AjaxResult.STATUS_SUCCESS, Collections.singletonList(sysVipInfo));
}
-
void checkNeedToBeSalesman(SysVipInfo sysVipInfo, SysVipInfo loginUser) {
@@ -236,12 +235,7 @@
queryWrapper.eq("apply_status", ShopSalesmanApply.APPLY_STATUS_DSH);
ShopSalesmanApply shopSalesmanApply = salesmanApplyDao.selectOne(queryWrapper);
if (shopSalesmanApply == null) {//没有待审核记录
- try {
- shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getId(), null, null, 2);
- }catch (Exception e){
- LogUtil.debug(e.getMessage());
- }
-
+ shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getId(), null, null, 2);
}
}
}
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 496ce97..863a592 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -4,9 +4,9 @@
#线上测试环境
#
-spring.datasource.username=ct_test
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+#spring.datasource.username=ct_test
+#spring.datasource.password=123456
+#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#spring.datasource.username=xc_shop
#spring.datasource.password=xc_shop123!@#
@@ -17,9 +17,9 @@
#spring.datasource.password=hive123!@#
#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-#spring.datasource.username=meidu_data
-#spring.datasource.password=meidu_4321#&@
-#spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=meidu_data
+spring.datasource.password=meidu_4321#&@
+spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.1