From 03cf90fca0d530d295cdfcd717e8473bd1d347ec Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 13 一月 2022 17:49:59 +0800
Subject: [PATCH] 商业街bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
index 287240b..0935a9e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
@@ -253,7 +253,7 @@
             if (R.isOk(userInfoVOR) && nonNull(userInfoVOR.getData())) {
                 LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(userInfoVOR.getData()), LoginUserInfoVO.class);
                 mcsMerchant = new McsMerchant();
-                mcsMerchant.setName(isBlank(merchantName) ? "默认名称" : merchantName);
+                mcsMerchant.setName(isBlank(merchantName) ? loginUserInfoVO.getName() : merchantName);
                 mcsMerchant.setPhone(loginUserInfoVO.getPhone());
                 mcsMerchant.setAccount(loginUserInfoVO.getAccount());
                 mcsMerchant.setLevel(1);
@@ -265,6 +265,9 @@
                 mcsMerchant.setCreatedBy(userId);
                 mcsMerchant.setUpdatedBy(userId);
                 num = this.baseMapper.insert(mcsMerchant);
+                McsMerchantDTO mcsMerchantDTO = new McsMerchantDTO();
+                mcsMerchantDTO.setName(mcsMerchant.getName());
+                userService.putMcsMerchantUser(mcsMerchantDTO);
             } else {
                 return R.fail("获取用户信息失败");
             }

--
Gitblit v1.7.1