From 296fc0dbd38fb9528c9d1f91ec9bc3758e27e994 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 19:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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 75c27d7..a80c6a7 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
@@ -35,6 +35,7 @@
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.EditUsersRequest;
import com.doumee.dao.web.reqeust.ContentShareImgDto;
+import com.doumee.dao.web.reqeust.GenerateQRCodeRequest;
import com.doumee.dao.web.reqeust.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.UsersService;
@@ -44,6 +45,8 @@
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;
import me.chanjar.weixin.common.error.WxErrorException;
@@ -58,7 +61,10 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.*;
import java.util.concurrent.Callable;
@@ -73,6 +79,7 @@
* @date 2024/07/04 14:40
*/
@Service
+@Slf4j
public class UsersServiceImpl implements UsersService {
@@ -436,7 +443,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇鎵嬫満鍙峰け璐�");
}
@@ -671,6 +678,9 @@
@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())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -690,16 +700,16 @@
if(img1 ==null){
return param.getImgurl();
}
- /* if(img1.getWidth() <200 && img1.getHeight()<100){
+ /* if(img1.getWidth() <200 && img1.getHeight()<100){
return param.getImgurl();
- }
-*/
+ }*/
String defualtHeader = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.USER_CARD_HEADER_IMG).getCode();
String imgurl =StringUtils.isNotBlank(users.getImgurl())?path+(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.USERS_FILE).getCode())+users.getImgurl():defualtHeader;
String url =null;
//鍐呭鍒嗕韩娴锋姤鍥剧墖
InputStream mpCode = Constants.generateWxMiniImgStream(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
- "userId="+users.getId()+"&articleId="+param.getArticleId(),
+ //"userId="+users.getId()+"&articleId="+param.getArticleId(),
+ param.getArticleId()+"_"+users.getId(),
param.getPageUrl());//灏忕▼搴�
InputStream inputStream = GeneratePicUtil.generateShareWithUserImg(
@@ -716,21 +726,24 @@
url = path+fileName;
}
return url;
-
}
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(),
+ //"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());
@@ -744,6 +757,8 @@
@Override
public String getUserCard(Users users){
+ users = usersMapper.selectById(users.getId());
+ this.getUsersDetail(users);
String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode();
String folder = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.USERS_FILE).getCode();
if(StringUtils.isNotBlank(users.getCardImg()) && !StringUtils.equals(users.getCardImg(),"-")){
@@ -828,7 +843,9 @@
Shop shop = shopMapper.selectById(users.getDepartmentId());
if(Objects.nonNull(shop)){
users.setShopName(shop.getName());
- users.setShopCity(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
+ 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{
@@ -852,7 +869,7 @@
//TODO 璋冭捣 涓彴鎺ュ彛
usersMapper.update(new UpdateWrapper<Users>()
.lambda()
- .set(Users::getCardImg,"-") //閲嶇疆鍚嶇墖涓� -
+ .set(Users::getCardImg,null) //閲嶇疆鍚嶇墖涓� -
.set(StringUtils.isNotBlank(editUsersRequest.getImgurl()),Users::getImgurl,editUsersRequest.getImgurl())
.set(StringUtils.isNotBlank(editUsersRequest.getName()),Users::getName,editUsersRequest.getName())
.set(StringUtils.isNotBlank(editUsersRequest.getPhone()),Users::getPhone,editUsersRequest.getPhone())
@@ -873,10 +890,6 @@
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(StringUtils.isBlank(users.getOpenid())){
- redisTemplate.delete(token);
- return null;
- }
//鏍￠獙鐢ㄦ埛token淇℃伅
MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,users.getId(), ZTConstants.BUSINESS);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
@@ -887,11 +900,47 @@
usersMapper.update(new UpdateWrapper<Users>().lambda()
.set(Users::getOpenid,null)
.set(Users::getEditDate,new Date())
- .eq(Users::getId,users.getId())
+ .eq(Users::getOpenid,users.getOpenid())
);
- redisTemplate.delete(ZTConstants.BUSINESS+"_"+ users.getId());
+ redisTemplate.delete(token);
return ztBaseRequst;
}
+
+
+ @Override
+ public InputStream getQrCode(GenerateQRCodeRequest generateQRCodeRequest){
+ if(Objects.isNull(generateQRCodeRequest)
+ ||StringUtils.isBlank(generateQRCodeRequest.getIamId())
+ || StringUtils.isBlank(generateQRCodeRequest.getBusinessId())
+ || Objects.isNull(generateQRCodeRequest.getBusinessType())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(generateQRCodeRequest.getBusinessType()<Constants.ZERO || generateQRCodeRequest.getBusinessType() > Constants.THREE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟绫诲瀷閿欒");
+ }
+ Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getIamId,
+ generateQRCodeRequest.getIamId()).last("limit 1"));
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐淇℃伅");
+ }
+ InputStream inputStream = Constants.generateWxMiniImgStream(
+ systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
+ generateQRCodeRequest.getBusinessId()+"_"+generateQRCodeRequest.getBusinessType()+"_"+users.getId(),
+ null);//灏忕▼搴�
+ return inputStream;
+// try {
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// byte[] buffer = new byte[1024];
+// int len = -1;
+// while ((len = inputStream.read(buffer)) != -1) {
+// baos.write(buffer, 0, len);
+// }
+// return "data:mediatype;base64," + Base64.getEncoder().encodeToString(baos.toByteArray());
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"浜岀淮鐮佺敓鎴愬け璐�");
+ }
}
--
Gitblit v1.9.3