Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
09274fae
Commit
09274fae
authored
Dec 08, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改店铺资料
parent
0d8565ea
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
90 additions
and
0 deletions
+90
-0
CompanyInfoBiz.java
...com/github/wxiaoqi/security/admin/biz/CompanyInfoBiz.java
+41
-0
AppUserV2DTO.java
.../src/main/java/com/xxfc/platform/im/dto/AppUserV2DTO.java
+20
-0
ImFeign.java
...api/src/main/java/com/xxfc/platform/im/feign/ImFeign.java
+6
-0
UserBiz.java
...erver/src/main/java/com/xxfc/platform/im/biz/UserBiz.java
+15
-0
UserController.java
...c/main/java/com/xxfc/platform/im/rest/UserController.java
+8
-0
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/CompanyInfoBiz.java
View file @
09274fae
...
@@ -14,9 +14,13 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
...
@@ -14,9 +14,13 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.app.entity.Cofig
;
import
com.xxfc.platform.app.entity.Cofig
;
import
com.xxfc.platform.app.feign.ConfigFeign
;
import
com.xxfc.platform.app.feign.ConfigFeign
;
import
com.xxfc.platform.im.dto.AppUserV2DTO
;
import
com.xxfc.platform.im.feign.ImFeign
;
import
com.xxfc.platform.universal.dto.SendMsgDTO
;
import
com.xxfc.platform.universal.dto.SendMsgDTO
;
import
com.xxfc.platform.universal.dto.UploadImgDTO
;
import
com.xxfc.platform.universal.feign.MQSenderFeign
;
import
com.xxfc.platform.universal.feign.MQSenderFeign
;
import
com.github.wxiaoqi.security.admin.dto.CompanyInfoFindDTO
;
import
com.github.wxiaoqi.security.admin.dto.CompanyInfoFindDTO
;
import
com.xxfc.platform.universal.feign.ThirdFeign
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
...
@@ -45,6 +49,9 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
...
@@ -45,6 +49,9 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
@Autowired
@Autowired
UserBiz
userBiz
;
UserBiz
userBiz
;
@Autowired
AppUserDetailBiz
appUserDetailBiz
;
@Autowired
@Autowired
ConfigFeign
configFeign
;
ConfigFeign
configFeign
;
...
@@ -61,6 +68,12 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
...
@@ -61,6 +68,12 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
@Autowired
@Autowired
CompanyWalletBiz
companyWalletBiz
;
CompanyWalletBiz
companyWalletBiz
;
@Autowired
ThirdFeign
thirdFeign
;
@Autowired
ImFeign
imFeign
;
public
static
final
String
CODE
=
"SHOP-"
;
public
static
final
String
CODE
=
"SHOP-"
;
...
@@ -85,6 +98,8 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
...
@@ -85,6 +98,8 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
addUser
(
id
);
addUser
(
id
);
//初始化店铺
//初始化店铺
setInviterAccount
(
companyInfoApply
);
setInviterAccount
(
companyInfoApply
);
//修改app用户资料
setHeadImg
(
companyInfo
);
BranchCompany
branchCompany
=
getBranchCompanyInfo
();
BranchCompany
branchCompany
=
getBranchCompanyInfo
();
BeanUtils
.
copyProperties
(
companyInfo
,
branchCompany
);
BeanUtils
.
copyProperties
(
companyInfo
,
branchCompany
);
branchCompany
.
setCompanyId
(
id
);
branchCompany
.
setCompanyId
(
id
);
...
@@ -100,6 +115,32 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
...
@@ -100,6 +115,32 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
sendQueue
(
companyInfo
);
sendQueue
(
companyInfo
);
return
id
;
return
id
;
}
}
public
void
setHeadImg
(
CompanyInfo
companyInfo
){
UploadImgDTO
uploadImgDTO
=
new
UploadImgDTO
();
uploadImgDTO
.
setUserId
(
companyInfo
.
getAppUserId
());
uploadImgDTO
.
setPrefix
(
companyInfo
.
getHeadLogo
());
try
{
ObjectRestResponse
<
String
>
restResponse
=
thirdFeign
.
uploadHead
(
uploadImgDTO
);
AppUserDetail
userDetail
=
new
AppUserDetail
();
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
restResponse
.
getData
())){
userDetail
.
setHeadimgurl
(
restResponse
.
getData
());
}
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
companyInfo
.
getName
())){
AppUserLogin
userLogin
=
appUserBiz
.
selectById
(
companyInfo
.
getAppUserId
());
if
(
userLogin
!=
null
){
AppUserV2DTO
appUserV2DTO
=
new
AppUserV2DTO
();
appUserV2DTO
.
setNickname
(
companyInfo
.
getName
());
appUserV2DTO
.
setPhone
(
userLogin
.
getUsername
());
imFeign
.
updateV2
(
appUserV2DTO
);
}
}
userDetail
.
setNickname
(
companyInfo
.
getName
());
appUserDetailBiz
.
updateSelectiveById
(
userDetail
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
}
public
void
setHeadLog
(
CompanyInfo
companyInfo
){
public
void
setHeadLog
(
CompanyInfo
companyInfo
){
String
headLog
=
companyInfo
.
getHeadLogo
();
String
headLog
=
companyInfo
.
getHeadLogo
();
...
...
xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/dto/AppUserV2DTO.java
0 → 100644
View file @
09274fae
package
com
.
xxfc
.
platform
.
im
.
dto
;
import
com.github.wxiaoqi.security.admin.entity.User
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Data
public
class
AppUserV2DTO
{
private
String
nickname
;
private
String
phone
;
}
\ No newline at end of file
xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/feign/ImFeign.java
View file @
09274fae
...
@@ -2,6 +2,8 @@ package com.xxfc.platform.im.feign;
...
@@ -2,6 +2,8 @@ package com.xxfc.platform.im.feign;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.im.dto.AppUserV2DTO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -34,4 +36,8 @@ public interface ImFeign {
...
@@ -34,4 +36,8 @@ public interface ImFeign {
@RequestMapping
(
value
=
"/user/app/unauth/login"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/user/app/unauth/login"
,
method
=
RequestMethod
.
POST
)
public
BaseResponse
login
(
@RequestBody
Map
<
String
,
Object
>
map
);
public
BaseResponse
login
(
@RequestBody
Map
<
String
,
Object
>
map
);
@PostMapping
(
value
=
"user/updateV2"
)
ObjectRestResponse
updateV2
(
@RequestBody
AppUserV2DTO
appUserV2DTO
);
}
}
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java
View file @
09274fae
...
@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.common.constant.UserConstant;
...
@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.common.constant.UserConstant;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.mongodb.client.result.UpdateResult
;
import
com.mongodb.client.result.UpdateResult
;
import
com.xxfc.platform.im.dto.AppUserV2DTO
;
import
com.xxfc.platform.im.model.User
;
import
com.xxfc.platform.im.model.User
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.codec.digest.DigestUtils
;
import
org.apache.commons.codec.digest.DigestUtils
;
...
@@ -138,6 +139,20 @@ public class UserBiz {
...
@@ -138,6 +139,20 @@ public class UserBiz {
return
ObjectRestResponse
.
succ
(
updateResult
);
return
ObjectRestResponse
.
succ
(
updateResult
);
}
}
public
ObjectRestResponse
updateUserInfoV2
(
AppUserV2DTO
appUserDTO
)
{
String
nickname
=
appUserDTO
.
getNickname
();
if
(
StringUtils
.
isBlank
(
nickname
))
{
return
ObjectRestResponse
.
paramIsEmpty
();
}
String
phone
=
appUserDTO
.
getPhone
();
Query
query
=
new
Query
(
Criteria
.
where
(
"phone"
).
is
(
phone
));
Update
update
=
Update
.
update
(
"nickname"
,
nickname
);
UpdateResult
updateResult
=
mongoTemplate
.
updateFirst
(
query
,
update
,
Map
.
class
,
"user"
);
return
ObjectRestResponse
.
succ
(
updateResult
);
}
/**
/**
* 远程请求
* 远程请求
* @param path
* @param path
...
...
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/UserController.java
View file @
09274fae
...
@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
...
@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.im.biz.UserBiz
;
import
com.xxfc.platform.im.biz.UserBiz
;
import
com.xxfc.platform.im.dto.AppUserV2DTO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -48,4 +49,11 @@ public class UserController {
...
@@ -48,4 +49,11 @@ public class UserController {
return
mtBiz
.
updateUserInfo
(
nickname
);
return
mtBiz
.
updateUserInfo
(
nickname
);
}
}
@PostMapping
(
value
=
"updateV2"
)
public
ObjectRestResponse
updateV2
(
@RequestBody
AppUserV2DTO
appUserV2DTO
)
{
return
mtBiz
.
updateUserInfoV2
(
appUserV2DTO
);}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment