From d295f1f7706e51b158cb7252b6ac633b1f9a1982 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 五月 2026 09:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
index fe76610..232406b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
@@ -64,8 +64,6 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
- @Autowired
- private ShopMapper shopMapper;
@Override
public InviteInfoResponse getInviteInfo(Integer memberId){
@@ -81,7 +79,7 @@
.selectAs(Member::getImgurl,InviteRecord::getImgUrl)
.leftJoin(Member.class,Member::getId,InviteRecord::getMemberId)
.eq(InviteRecord::getIsdeleted,Constants.ZERO)
- .eq(InviteRecord::getMemberId,memberId)
+ .eq(InviteRecord::getInviteId,memberId)
.orderByDesc(InviteRecord::getId)
);
@@ -112,32 +110,30 @@
* @throws Exception
*/
@Override
- public String createShareImg(Integer userType,Integer memberId) throws Exception {
+ public String createShareImg(Integer userType,Integer memberId,String posterImg) throws Exception {
String imgUrl = systemDictDataBiz.queryByCode(Constants.ORDER_SET,Constants.INVITE_IMG_URL).getCode();
- String suffix = "m_" + memberId;
+ String suffix = "uid_"+ memberId;
if(Constants.equalsInteger(Constants.ONE,userType)){
- Shop shop = shopMapper.selectById(memberId);
- if(Objects.nonNull(shop)
- && StringUtils.isNotBlank(shop.getPosterImg())){
+ if(StringUtils.isNotBlank(posterImg)){
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
- imgUrl = path + shop.getPosterImg();
+ imgUrl = path + posterImg;
+ suffix = "sid_"+ memberId;
}
- suffix = "s_"+memberId;
}
BufferedImage img1 = GeneratePicUtil.transfromToImage(imgUrl,imgUrl.substring(imgUrl.lastIndexOf(".") + 1));
if (img1 == null) {
return imgUrl;
}
- String url = null;
- String scene = "trial";
+ String url = "/pages/index/index";
+ String scene = suffix;
//鍐呭鍒嗕韩娴锋姤鍥剧墖
InputStream mpCode = Constants.generateWxMiniImgStream(
scene,
- "",
+ url,
false);//灏忕▼搴�
- InputStream inputStream = GeneratePicUtil.generateShareWithUserImg(
- img1
+ InputStream inputStream = GeneratePicUtil.generateShopImg(
+ imgUrl
, mpCode);
ALiYunUtil obs = new ALiYunUtil(
systemDictDataBiz.queryByCode(Constants.OSS,Constants.ENDPOINT).getCode()
@@ -147,8 +143,9 @@
String fileName = shareFolder + key;
if (obs.uploadOnlineObject(inputStream,systemDictDataBiz.queryByCode(Constants.OSS, Constants.BUCKETNAME).getCode(), fileName,null)) {
url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() + fileName;
+ return key;
}
- return url;
+ return null;
}
@@ -156,8 +153,8 @@
public String createShopMiniProgramCode(Integer shopId) throws Exception {
//鍐呭鍒嗕韩娴锋姤鍥剧墖
InputStream inputStream = Constants.generateWxMiniImgStream(
- "trial",
- "/page/index/?shopId="+shopId,
+ "sid_"+shopId,
+ "/pages/index/index",
true);//灏忕▼搴�
String url = null;
ALiYunUtil obs = new ALiYunUtil(
@@ -170,8 +167,33 @@
String fileName = shareFolder + key;
if (obs.uploadOnlineObject(inputStream,systemDictDataBiz.queryByCode(Constants.OSS, Constants.BUCKETNAME).getCode(), fileName,null)) {
url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() + fileName;
+ return key;
}
- return url;
+ return null;
+ }
+
+
+ @Override
+ public String createMemberMiniProgramCode(Integer memberId) throws Exception {
+ InputStream inputStream = Constants.generateWxMiniImgStream(
+ "uid_"+memberId,
+ "/pages/index/index",
+ true);
+ if (inputStream == null) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "灏忕▼搴忓垎浜爜鐢熸垚澶辫触");
+ }
+ ALiYunUtil obs = new ALiYunUtil(
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.ENDPOINT).getCode()
+ ,systemDictDataBiz.queryByCode(Constants.OSS,Constants.ACCESS_ID).getCode(),
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.ACCESS_KEY).getCode());
+
+ String shareFolder = systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHARES_FILE).getCode();
+ String key = DateUtil.getNowShortDate() + "/" + UUID.randomUUID().toString() + ".jpg";
+ String fileName = shareFolder + key;
+ if (obs.uploadOnlineObject(inputStream,systemDictDataBiz.queryByCode(Constants.OSS, Constants.BUCKETNAME).getCode(), fileName,null)) {
+ return key;
+ }
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "灏忕▼搴忓垎浜爜涓婁紶澶辫触");
}
--
Gitblit v1.9.3