From 5a42219c9f91fd8fa77ddd8c8945d03168250b68 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:09 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 6429dc8..e400da7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -45,6 +45,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
import okhttp3.Response;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
@@ -78,6 +79,7 @@
* @date 2024/07/04 14:40
*/
@Service
+@Slf4j
public class UsersServiceImpl implements UsersService {
@@ -441,7 +443,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇鎵嬫満鍙峰け璐�");
}
@@ -676,6 +678,7 @@
@Override
public String getContentShareImg(Users users, ContentShareImgDto param){
+ log.error("======================start===========:娴锋姤寮�濮�"+JSONObject.toJSONString(param));
users = usersMapper.selectById(users.getId());
this.getUsersDetail(users);
if(StringUtils.isBlank(param.getImgurl())){
@@ -727,18 +730,20 @@
private String dealShareImgNoUser(ContentShareImgDto param, Users users, String shareFolder, String path) {
String url =null;
- //鍐呭鍒嗕韩娴锋姤鍥剧墖
- //鍐呭鍒嗕韩娴锋姤鍥剧墖
+ log.error("======================start===========:娴锋姤寮�濮�");
InputStream mpCode = Constants.generateWxMiniImgStream(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
//"userId="+users.getId()+"&articleId="+param.getArticleId(),
param.getArticleId()+"_"+users.getId(),
param.getPageUrl());//灏忕▼搴�
+ log.error("======================mpcode===========:鑾峰彇灏忕▼搴忕爜寮�濮�");
String title = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.SHARE_HAIBAO_HEADER_TITLE).getCode();
InputStream inputStream = GeneratePicUtil.generateShareImg(
param.getImgurl()
,mpCode
,title);
+
+ log.error("======================huatu===========:鐢诲浘缁撴潫");
TyyZosUtil obs = new TyyZosUtil( systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ENDPOINT).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_ID).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_KEY).getCode());
@@ -834,17 +839,22 @@
if(StringUtils.isBlank(users.getSlogans())){
users.setSlogans(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.ZBOM_CUSTOMIZED,Constants.USER_LABEL).getCode()));
}
+ users.setManageShop(false);
+ if(StringUtils.isNotBlank(users.getRoleCodes())){
+ if(users.getRoleCodes().indexOf(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.ZBOM_CUSTOMIZED,Constants.USERS_MANAGE_CODE).getCode()))>=0){
+ users.setManageShop(true);
+ }
+ }
if(Objects.nonNull(users.getDepartmentId())){
Shop shop = shopMapper.selectById(users.getDepartmentId());
if(Objects.nonNull(shop)){
users.setShopName(shop.getName());
- if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
- users.setShopCity(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
- }
if(StringUtils.isNotBlank(shop.getAddress())){
users.setShopAddress(shop.getAddress());
}else{
- users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName()+shop.getTown()+shop.getRegAddr());
+ if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
+ users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
+ }
}
}
}
--
Gitblit v1.9.3