From e7eea688585603c5a8f134d92762e8431d885d36 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:59:11 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
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);
}
}
}
--
Gitblit v1.9.1