From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 4ccb773..9cac99e 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
@@ -108,10 +108,10 @@
sysVipInfo.setSessionKey(sessionKey);
sysVipInfo.setCompanyId(HostInterceptor.getCompanyId());
sysVipInfo.setArrivalWay("微商城");
+ sysVipInfo.setVipName("微信用户");
sysVipInfo.setVipState(Dictionary.VIP_STATE_HY);
sysVipInfo.setVipType(Dictionary.VIP_TYPE_NOCARD);
sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
-
sysVipInfo.setVipNo(openId);
sysVipInfoService.add(sysVipInfo);
@@ -174,8 +174,15 @@
SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
SysVipInfo sysVipInfo=new SysVipInfo();
sysVipInfo.setId(loginUser.getId());
+
BeanUtil.copyProperties(xcxUserSaveUserInfoDto,sysVipInfo);
sysVipInfo.setPhone(xcxUserSaveUserInfoDto.getPhoneNumber());
+ if(StringUtils.isBlank(loginUser.getVipName())||loginUser.getVipName().equals("微信用户")){
+ sysVipInfo.setVipName(xcxUserSaveUserInfoDto.getNickName());
+ }
+ if(StringUtils.isBlank(loginUser.getSex())){
+ sysVipInfo.setSex(xcxUserSaveUserInfoDto.getGender()==1?"男":"女");
+ }
int i = sysVipInfoDao.update(sysVipInfo);
--
Gitblit v1.9.1