From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java
index 5d59638..67b5bbb 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java
@@ -5,6 +5,7 @@
import com.matrix.biz.service.BizUserService;
import com.matrix.component.rabbitmq.MqTask;
import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.StringUtils;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -45,16 +46,26 @@
SysVipInfo vip = vipDap.selectByPhone(userInfo.getPhoneNumber());
if (vip != null) {
LogUtil.warn("会员{}已经存在", userInfo.getPhoneNumber());
+ //更新信息
+ vip.setOpenId(userInfo.getOpenId());
+ if(StringUtils.isBlank(vip.getPhoto())){
+ vip.setPhoto(userInfo.getAvatarUrl());
+ }
+ vipDap.update(vip);
} else {
SysVipInfo vipInfo = new SysVipInfo();
//在备注记下微商城的用户id
- vipInfo.setRemark(userInfo.getOpenId());
+ vipInfo.setOpenId(userInfo.getOpenId());
vipInfo.setAddr(userInfo.getProvince() + " " + userInfo.getCity());
vipInfo.setPhone(userInfo.getPhoneNumber());
+ if(StringUtils.isBlank(vipInfo.getPhoto())){
+ vipInfo.setPhoto(userInfo.getAvatarUrl());
+ }
if (userInfo.getGender() != null) {
vipInfo.setSex(userInfo.getGender().equals("1") ? "男" : "女");
}
vipInfo.setVipName(userInfo.getNickName());
+ vipInfo.setCompanyId(userInfo.getCompanyId());
vipInfo.setShopId(shopId);
vipInfo.setArrivalWay("微商城");
vipInfo.setVipState(Dictionary.VIP_STATE_HY);
--
Gitblit v1.9.1