Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-17 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4

 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,12 +46,21 @@
            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") ? "男" : "女");
                }