From 6c6c0825e59377261b9972af95e1e4dafb43fcfd Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 25 十一月 2022 17:44:04 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index fca3336..9e379ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -31,6 +31,7 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
+import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
@@ -554,6 +555,19 @@
if (nonNull(propertyAccount)){
loginUserInfoVO.setPropertyId(propertyAccount);
}
+ }
+ //获取自提点账号
+ if (StrUtil.isNotBlank(sysUserDO.getPhone())){
+ if(userDao.checkPoint(sysUserDO.getPhone()) > 0){
+ loginUserInfoVO.setIsPoint(true);
+ }else {
+ loginUserInfoVO.setIsPoint(false);
+ }
+ }
+ //默认地址
+ ComShopUserAddressVO comShopUserAddressVO = userDao.selectDefaultAddressVO(userId);
+ if (nonNull(comShopUserAddressVO)){
+ loginUserInfoVO.setComShopUserAddressVO(comShopUserAddressVO);
}
return R.ok(loginUserInfoVO);
}
@@ -2901,6 +2915,7 @@
sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
+ sysUserDO.setAppId("wx118de8a734d269f0");
try {
userDao.insert(sysUserDO);
return R.ok(sysUserDO.getUserId());
--
Gitblit v1.7.1