From b0b94a084ed6c1a685caebb8dfb1a0d65fdd9ef6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 10:57:42 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java | 2 +-
server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java | 4 +---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java | 8 ++++----
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 2 +-
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 8 ++++----
5 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
index 048701c..d0bb084 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
@@ -19,6 +19,6 @@
private String token;
private String openId;
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭" , hidden = true)
- private Long userId;
+ private String userId;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java
index 2a6849f..22e0c3e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java
@@ -15,13 +15,13 @@
*/
private List<String> articleIds;
/**
+ * 鐢ㄦ埛ID
+ */
+// private String userId;
+ /**
* OpenID
*/
private String openId;
- /**
- * 鐢ㄦ埛ID
- */
- private String userId;
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
index 8a443f0..b6af5c6 100644
--- a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
@@ -133,9 +133,7 @@
g2.drawRect(0, 0, width - 1, height - 1);
InputStream inputStream = bufferedImageToInputStream(bi);
return inputStream;
-// String fileName = "8701EAC36DEC405A94C530F0E6796589.jpg"; //ID.nextGUID() + ".jpg";
-// GeneratePicUtil.saveFile(inputStream, filePath+ File.separator+fileName);
-// return filePath + File.separator+ fileName;
+
}
public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index dc58bee..b834ec6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -146,7 +146,7 @@
@Override
public ZTContentInfoResponse getContentInfo(String id,String userType,Long userId){
//鏌ヨ 涓彴 TOKEN
- String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
+ String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId.toString(),userType);
ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
ztContentListRequest.setToken(token);
ztContentListRequest.setUserType(userType);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 0c3bae8..9dce68e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -317,7 +317,7 @@
public void updMemberDetail(EditMemberRequest editMemberRequest){
Member member = memberMapper.selectById(editMemberRequest.getMemberId());
ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new ZTUserInfoUpdateRequest();
- ztUserInfoUpdateRequest.setOpenid(member.getOpenid());
+ ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
ztUserInfoUpdateRequest.setAppId(appId);
ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
@@ -373,7 +373,7 @@
- public static String getZTToken(ZbomZhongTaiService zbomZhongTaiService, MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
+ public static String getZTToken(ZbomZhongTaiService zbomZhongTaiService, MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, String id, String userType){
if(userType.equals(Constants.CUSTOMER)){
Member member = memberMapper.selectById(id);
if(Objects.isNull(member)){
@@ -439,11 +439,11 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
}
//鏍￠獙鐢ㄦ埛token淇℃伅
- MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),Constants.CUSTOMER);
+ MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId().toString(),Constants.CUSTOMER);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
ztBaseRequst.setUserType(Constants.CUSTOMER);
- ztBaseRequst.setOpenid(member.getOpenid());
+ ztBaseRequst.setOpenId(member.getOpenid());
ztBaseRequst.setToken(member.getToken());
Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
if(logoutFlag){
--
Gitblit v1.9.3