From f674eef2bdf97352514e5fe024518714d1996b1d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 21 七月 2024 22:52:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/dao/business/model/News.java | 2
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 43 ++--
server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 35 +--
server/web/src/main/java/com/doumee/api/web/ApiController.java | 6
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 43 ++--
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 4
server/service/src/main/java/com/doumee/service/business/UsersService.java | 3
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/APISpaceCaseVo.java | 38 ++++
server/service/src/main/java/com/doumee/service/business/NewsService.java | 1
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 2
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 33 +++
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 46 ++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java | 4
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java | 4
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java | 44 ++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java | 38 ++++
server/service/src/main/java/com/doumee/dao/business/model/Users.java | 2
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 10 +
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 4
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 58 ++++++
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 13
server/web/src/main/java/com/doumee/api/web/CommonApi.java | 7
server/web/src/main/java/com/doumee/api/web/CatalogApi.java | 6
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 8
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCollectLikeRequest.java | 26 ++
26 files changed, 388 insertions(+), 94 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
index 2327f93..23cf7fa 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -44,9 +44,9 @@
List<ZTAreaInfoResponse> getAreaList(ZTAreaListRequest param);
List<ZTAreaTreeResponse> getAreaTreeList(ZTAreaListRequest param);
boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param);
- ZSZXCatalogResponse getZSZXCatalogs();
ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param);
List<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
+ ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index 8abf61d..ae3bc9a 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -83,27 +83,7 @@
* 鑾峰彇鐢ㄦ埛鐧婚檰token
* @return
*/
- @Override
- public ZSZXCatalogResponse getZSZXCatalogs(){
- ZSZXCatalogResponse response = new ZSZXCatalogResponse();
- ZTCatalogListRequest param = new ZTCatalogListRequest();
- param.setCatalogCode(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU);
- List<ZTCatalogInfoResponse> cataList = getCatalogList(param);
- if(cataList!=null ){
- for(ZTCatalogInfoResponse data : cataList){
- if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.JIADE_ID)){
- response.setJdId(data);
- }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.CHUFANGSHEJI)){
- response.setCfsj(data);
- }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.QW_SHEJI)){
- response.setQwsj(data);
- }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.SHOUNASHEJI)){
- response.setSnsj(data);
- }
- }
- }
- return response;
- }
+
/**
* 鐢ㄦ埛淇℃伅鍚屾
* @param param
@@ -716,4 +696,25 @@
log.error("銆愪腑鍙版帴鍙ｏ細"+name+"銆�================澶辫触====锛歕n"+ res);
}
}
+
+
+ /**
+ * 鑾峰彇鎴戠殑鍠滄/鏀惰棌鍒楄〃
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param){
+ ZTBaseResponse<ZTBasePageResponse<ZTCollectLikeInfoResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.FAVORITES_PAGE_URL,
+ ZTConstants.IntegerName.FAVORITES_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTCollectLikeInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/APISpaceCaseVo.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/APISpaceCaseVo.java
new file mode 100644
index 0000000..e29c8c3
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/APISpaceCaseVo.java
@@ -0,0 +1,38 @@
+package com.doumee.biz.zbom.model.zhongtai;
+
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/19 11:33
+ */
+@Data
+public class APISpaceCaseVo {
+
+ private String caseInfo;
+ /**
+ * 绌洪棿涓诲浘
+ */
+ private String coverImage;
+ private String id;
+ /**
+ * 绌洪棿鍥剧墖
+ */
+ private String[] imgList;
+ private String intro;
+ private String publishDate;
+ private String publishDt;
+ /**
+ * 绌洪棿鎻忚堪
+ */
+ private String spaceDesc;
+ /**
+ * 绌洪棿鍚嶇О
+ */
+ private String spaceName;
+ private String title;
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCollectLikeRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCollectLikeRequest.java
new file mode 100644
index 0000000..8f3fe0a
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCollectLikeRequest.java
@@ -0,0 +1,26 @@
+package com.doumee.biz.zbom.model.zhongtai;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class ZTCollectLikeRequest extends ZTBaseRequst {
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 鏋氫妇鍊�: whole_case real_case product_intro")
+ private String businessType;
+
+ @ApiModelProperty(value = "褰撳墠椤�")
+ private String pageNum;
+
+ @ApiModelProperty(value = "姣忛〉鏉℃暟")
+ private String pageSize;
+
+ @ApiModelProperty(value = "涓氬姟绫诲埆 collect like")
+ private String businessCategory;
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭",hidden = true)
+ private String userId;
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
index 20f32c2..1422de9 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -77,6 +77,9 @@
String WHOLECASE_INFO_URL ="/content/api/wholeCaseDetail";
String REALCASE_PAGE_LIST_URL ="/content/api/realCasePageList";
String REALCASE_INFO_URL ="/content/api/realCaseDetail";
+ String FAVORITES_PAGE_URL ="/behavior/api/favoritesPageList";
+
+
}
public interface IntegerName{
String USER_UPDATE_NAME ="鐢ㄦ埛淇℃伅鍚屾";
@@ -115,5 +118,6 @@
String REALCASE_PAGE_LIST_NAME ="鑾峰彇瀹炴櫙妗堜緥鍒楄〃";
String REALCASE_INFO_NAME ="鑾峰彇瀹炴櫙妗堜緥璇︽儏";
+ String FAVORITES_NAME ="鑾峰彇鎴戠殑鍠滄/鏀惰棌鍒楄〃";
}
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
index dbb6f8b..eee4daf 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
@@ -32,8 +32,8 @@
@ApiModelProperty(value = "鎺掑簭鏂瑰紡 NORMAL - 榛樿锛汬OT - 鏈�鐑紱LATEST - 鏈�鏂帮紱")
private String sortType;
- @ApiModelProperty(value = "澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛紝澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛�",hidden = true)
- private List<String> tagCode;
+ @ApiModelProperty(value = "澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛紝澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛�")
+ private List<String> tagCodes;
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭",hidden = true)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
index 6957f48..337d193 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
+import com.doumee.biz.zbom.model.zhongtai.APISpaceCaseVo;
import lombok.Data;
import java.io.Serializable;
@@ -10,7 +11,7 @@
*/
@Data
public class ZTCaseInfoResponse implements Serializable {
- private String apiSpaceCaseVos;
+ private APISpaceCaseVo[] apiSpaceCaseVos;
private String caseInfo;
/**
* 鏀惰棌閲�
@@ -42,4 +43,5 @@
* 娴忚閲�
*/
private String viewCount;
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java
new file mode 100644
index 0000000..da2b41d
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java
@@ -0,0 +1,38 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 鎴戠殑鍠滄/鏀惰棌
+ */
+@Data
+public class ZTCollectLikeInfoResponse implements Serializable {
+ /**
+ * 鏀惰棌鏁�
+ */
+ @ApiModelProperty(value = "id")
+ private String id;
+ /**
+ * 鏍囬
+ */
+ @ApiModelProperty(value = "鏍囬")
+ private String displayName;
+ /**
+ * 缂╃暐鍥�
+ */
+ @ApiModelProperty(value = "缂╃暐鍥�")
+ private String thumbnailUrl;
+
+ @ApiModelProperty(value = "娴忚閲�")
+ private Integer viewCount;
+
+ @ApiModelProperty(value = "鏀惰棌閲�")
+ private Integer collectCount;
+
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
index 42c3e54..311584e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
@@ -1,5 +1,7 @@
package com.doumee.biz.zbom.model.zhongtai.response;
+import com.doumee.biz.zbom.model.zhongtai.APISpaceCaseVo;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -10,25 +12,67 @@
*/
@Data
public class ZTRealcaseInfoResponse implements Serializable {
+
private String caseInfo;
private String collectCount;
/**
* 涓诲浘
*/
+ @ApiModelProperty(value = "涓诲浘")
private String coverImage;
private String id;
private String[] imgList;
/**
* 鏄惁鏀惰棌 true:鏀惰棌 false:鏈敹钘�
*/
+ @ApiModelProperty(value = "鏄惁鏀惰棌 true:鏀惰棌 false:鏈敹钘�")
private boolean isCollection;
/**
* 鍙戝竷鏃ユ湡
*/
+ @ApiModelProperty(value = "鍙戝竷鏃ユ湡")
private String publishDt;
/**
* 鏍囬
*/
private String title;
private String viewCount;
+
+ private String contentCategory;
+ private String intro;
+ private String linkAddress;
+ /**
+ * 鎵撳紑鍐呭
+ */
+ @ApiModelProperty(value = "鎵撳紑鍐呭")
+ private String openContent;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "鍐呭鎵撳紑鏂瑰紡(鍐呴儴椤甸潰page銆佽棰憊ideo銆佸瘜鏂囨湰text銆佸閮ㄩ摼鎺ink)")
+ private String openType;
+ /**
+ * 鍥炬枃璇︽儏
+ */
+ private APISpaceCaseVo[] apiSpaceCaseVos;
+ /**
+ * 720鍏ㄦ櫙鍦板潃
+ */
+ private String layoutUlr;
+ private String panorama;
+
+ /**
+ * 璇︽儏鍥剧墖
+ */
+ private String[] contentImgList;
+ /**
+ * 鏍囩
+ */
+ private String[] contentLabelList;
+ /**
+ * 璇︽儏鏂囨湰
+ */
+ private String contentText;
+ private String recommandTitle;
+
}
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index f856bca..5d72f5a 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -97,16 +97,15 @@
public Boolean checkLogin(HttpServletRequest request, HttpServletResponse response){
String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
try {
- //鍒ゆ柇Token鏄惁瓒呮椂
- boolean expiration = JwtTokenUtil.isTokenExpired(token);
- if (expiration) {
- throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
- }
//鑾峰彇璐﹀彿ID
Long memberId = JwtTokenUtil.getJwtPayLoad(token).getUserId();
- Integer userType = JwtTokenUtil.getJwtPayLoad(token).getUserType();
- if(!Constants.equalsInteger(userType,Constants.ZERO)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃犺闂潈闄�");
+ String tokenRedis = (String) redisTemplate.opsForValue().get(ZTConstants.CUSTOMER+"_"+memberId);
+ if(StringUtils.isNotBlank(tokenRedis)){
+ if(!tokenRedis.equals(token)){
+ throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
Member member = dao.queryForObject(" select * from `member` where id = ? limit 1 ", new BeanPropertyRowMapper<>(Member.class),memberId );
if(Objects.isNull(member)){
@@ -129,19 +128,15 @@
public Boolean checkPersonnelLogin(HttpServletRequest request, HttpServletResponse response){
String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
try {
- if(isDebug){
- return true;
- }
- //鍒ゆ柇Token鏄惁瓒呮椂
- boolean expiration = JwtTokenUtil.isTokenExpired(token);
- if (expiration) {
- throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
- }
//鑾峰彇璐﹀彿ID
Long userId = JwtTokenUtil.getJwtPayLoad(token).getUserId();
- Integer userType = JwtTokenUtil.getJwtPayLoad(token).getUserType();
- if(!Constants.equalsInteger(userType,Constants.ONE)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃犺闂潈闄�");
+ String tokenRedis = (String) redisTemplate.opsForValue().get(ZTConstants.BUSINESS+"_"+userId);
+ if(StringUtils.isNotBlank(tokenRedis)){
+ if(!tokenRedis.equals(token)){
+ throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
Users users = dao.queryForObject(" select * from `users` where id = ? limit 1 ", new BeanPropertyRowMapper<>(Users.class),userId);
if(Objects.isNull(users)){
@@ -150,7 +145,7 @@
if(Constants.equalsInteger(users.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
- if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ if(!StringUtils.equals(users.getStatus(),Constants.ONE+"")){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
request.setAttribute(JwtTokenUtil.UserId_Name, userId);
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/News.java b/server/service/src/main/java/com/doumee/dao/business/model/News.java
index 0d633f5..04c6aef 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/News.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/News.java
@@ -98,6 +98,8 @@
@ApiModelProperty(value = "鏈�杩戝彂甯冨娉�")
@ExcelColumn(name="鏈�杩戝彂甯冨娉�")
private String publishInfo;
+
+
@ApiModelProperty(value = "鎿嶄綔浜�")
@ExcelColumn(name="鎿嶄綔浜�")
@TableField(exist = false)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Users.java b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
index d18349a..5725539 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Users.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
@@ -90,7 +90,7 @@
@ExcelColumn(name="寰俊openid")
private String openid;
- @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤", example = "1")
+ @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤锛�-1鍒犻櫎", example = "1")
@ExcelColumn(name="璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤")
private String status;
diff --git a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
index b0dba66..f49b3f8 100644
--- a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -2,6 +2,7 @@
import com.doumee.biz.zbom.model.zhongtai.*;
import com.doumee.biz.zbom.model.zhongtai.response.*;
+import com.doumee.dao.web.response.ZSZXCatalogResponse;
import java.util.List;
@@ -11,6 +12,9 @@
* @date 2024/07/04 14:40
*/
public interface GetZhongTaiDataService {
+
+
+ ZSZXCatalogResponse getZSZXCatalogs(Long userId);
/**
* 鍒嗙被鏁版嵁
@@ -147,4 +151,10 @@
*/
ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId);
+ /**
+ * 涓彴 - 鎴戠殑鏀惰棌/鍠滄鍒楄〃
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest ztCollectLikeRequest);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/NewsService.java b/server/service/src/main/java/com/doumee/service/business/NewsService.java
index d534900..9046351 100644
--- a/server/service/src/main/java/com/doumee/service/business/NewsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/NewsService.java
@@ -123,4 +123,5 @@
* @param userId
*/
void saveShareRecord(Long id,Long userId);
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/UsersService.java b/server/service/src/main/java/com/doumee/service/business/UsersService.java
index c376519..26b5ed7 100644
--- a/server/service/src/main/java/com/doumee/service/business/UsersService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UsersService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
@@ -118,4 +119,6 @@
void editUserInfo(EditUsersRequest editUsersRequest);
String getContentShareImg(Users loginUserInfo, ContentShareImgDto param);
+
+ ZTBaseRequst logOff(Long userId);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 5e73a02..0941de2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -132,7 +132,9 @@
.eq(CustomerLog::getIsdeleted, Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getType()),CustomerLog::getType, pageWrap.getModel().getType())
.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Customer::getMemberId, pageWrap.getModel().getMemberId());
-
+ if (pageWrap.getModel().getMemberId() != null) {
+ queryWrapper.eq(Customer::getMemberId, pageWrap.getModel().getMemberId());
+ }
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(CustomerLog::getId, pageWrap.getModel().getId());
}
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 47b86ee..31182ba 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
@@ -13,6 +13,7 @@
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
import com.doumee.service.business.GetZhongTaiDataService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
@@ -52,7 +53,29 @@
@Autowired
private RedisTemplate<String, Object> redisTemplate;
-
+ @Override
+ public ZSZXCatalogResponse getZSZXCatalogs(Long userId){
+ ZSZXCatalogResponse response = new ZSZXCatalogResponse();
+ ZTCatalogListRequest param = new ZTCatalogListRequest();
+ param.setUserId(userId.toString());
+ param.setUserType(ZTConstants.CUSTOMER);
+ param.setCatalogCode(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU);
+ List<ZTCatalogInfoResponse> cataList = getCatalogList(param);
+ if(cataList!=null ){
+ for(ZTCatalogInfoResponse data : cataList){
+ if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.JIADE_ID)){
+ response.setJdId(data);
+ }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.CHUFANGSHEJI)){
+ response.setCfsj(data);
+ }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.QW_SHEJI)){
+ response.setQwsj(data);
+ }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.SHOUNASHEJI)){
+ response.setSnsj(data);
+ }
+ }
+ }
+ return response;
+ }
@Override
public List<ZTCatalogInfoResponse> getCatalogList(ZTCatalogListRequest ztCatalogListRequest){
@@ -60,6 +83,10 @@
|| StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztCatalogListRequest.getUserId()),ztCatalogListRequest.getUserType());
+ System.out.println(JSONObject.toJSONString(ztBaseInfoResponse));
+ ztCatalogListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztCatalogListRequest.setToken(ztBaseInfoResponse.getToken());
return zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
}
@@ -70,6 +97,9 @@
|| StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztCatalogListRequest.getUserId()),ztCatalogListRequest.getUserType());
+ ztCatalogListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztCatalogListRequest.setToken(ztBaseInfoResponse.getToken());
return zbomZhongTaiService.getTagList(ztCatalogListRequest);
}
@@ -116,8 +146,13 @@
String data = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY);
List<ZTAreaTreeResponse> ztAreaTreeResponses = new ArrayList<>();
if(StringUtils.isBlank(data)){
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztAreaListRequest.getUserId()),ztAreaListRequest.getUserType());
+ ztAreaListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztAreaListRequest.setToken(ztBaseInfoResponse.getToken());
ztAreaTreeResponses = zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
- redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY,JSONArray.toJSONString(ztAreaTreeResponses));
+ if(CollectionUtils.isNotEmpty(ztAreaTreeResponses)){
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY,JSONArray.toJSONString(ztAreaTreeResponses));
+ }
}else{
ztAreaTreeResponses = JSONArray.parseArray(data,ZTAreaTreeResponse.class);
}
@@ -293,4 +328,23 @@
return response;
}
+
+
+ @Override
+ public ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest ztCollectLikeRequest){
+ if(Objects.isNull(ztCollectLikeRequest)
+ || Objects.isNull(ztCollectLikeRequest.getPageNum())
+ || Objects.isNull(ztCollectLikeRequest.getPageSize())
+ || StringUtils.isBlank(ztCollectLikeRequest.getBusinessType())
+ || StringUtils.isBlank(ztCollectLikeRequest.getBusinessCategory())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztCollectLikeRequest.getUserId()),ztCollectLikeRequest.getUserType());
+ ztCollectLikeRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTCollectLikeInfoResponse> response = zbomZhongTaiService.collectLikePage(ztCollectLikeRequest);
+ return response;
+ }
}
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 3c3b69d..ef73633 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
@@ -306,18 +306,17 @@
this.saveCustomerUser(users,member.getId());
}else{
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
- if(Objects.isNull(ztUserGetTokenResponse)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
- }else{
+ if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
+ memberMapper.updateById(member);
}
this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
-
}
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
String token = JwtTokenUtil.generateToken(payLoad);
+ redisTemplate.opsForValue().set(ZTConstants.CUSTOMER+"_"+member.getId(),token);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setSessionKey(session.getSessionKey());
@@ -439,7 +438,7 @@
ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(member.getHousetype()));
ZTBaseResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
if(Objects.isNull(userUpdateInfo)||userUpdateInfo.getCode()!=200){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴淇℃伅鏇存柊澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ return null;
}
ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
return ztUserGetTokenResponse;
@@ -545,7 +544,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(StringUtils.isBlank(member.getPhone())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
+ redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
+ return null;
}
//鏍￠獙鐢ㄦ埛token淇℃伅
MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
@@ -559,6 +559,7 @@
.set(Member::getEditDate,new Date())
.eq(Member::getId,member.getId())
);
+ redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
return ztBaseRequst;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
index f138695..58450d9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.dingtalk.api.request.OapiMaterialNewsListRequest;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -420,4 +421,5 @@
+
}
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 9f68729..4518fe5 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
@@ -4,8 +4,11 @@
import cn.hutool.core.date.DateUnit;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.IamUserRoleModel;
import com.doumee.biz.zbom.model.IamUserTypeModel;
+import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.excel.ExcelImporter;
@@ -21,6 +24,7 @@
import com.doumee.core.utils.tyyun.TyyZosUtil;
import com.doumee.dao.admin.request.ShopImport;
import com.doumee.dao.admin.request.UserImport;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ShopMapper;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.SmsEmailMapper;
@@ -81,6 +85,11 @@
private SmsEmailMapper smsEmailMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private ZbomZhongTaiService zbomZhongTaiService;
@Override
public Long create(Users users) {
@@ -323,12 +332,12 @@
}
Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getPhone,phone).last("limit 1"));
if(Objects.isNull(users)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌璐︽埛淇℃伅");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璐﹀彿淇℃伅涓嶅瓨鍦紒");
}
if(!Constants.equalsInteger(users.getIsdeleted(), Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插垹闄�");
}
- if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ if(StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
}
//楠岃瘉鐭俊
@@ -355,6 +364,7 @@
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
String token = JwtTokenUtil.generateToken(payLoad);
+ redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setUsers(users);
@@ -382,10 +392,14 @@
if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
}
+ users.setOpenid(openId);
+ usersMapper.updateById(users);
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
String token = JwtTokenUtil.generateToken(payLoad);
+ redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
accountResponse.setToken(token);
+ getUsersDetail(users);
accountResponse.setUsers(users);
return accountResponse;
} catch (WxErrorException e) {
@@ -756,7 +770,7 @@
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
+ if(!Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄦ埛宸茬鐢�");
}
getUsersDetail(users);
@@ -821,7 +835,31 @@
-
+ @Override
+ public ZTBaseRequst logOff(Long userId){
+ Users users = usersMapper.selectById(userId);
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(StringUtils.isBlank(users.getOpenid())){
+ redisTemplate.delete(ZTConstants.BUSINESS+"_"+ users.getId());
+ return null;
+ }
+ //鏍￠獙鐢ㄦ埛token淇℃伅
+ MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,users.getId(), ZTConstants.BUSINESS);
+ //璋冭捣涓彴娉ㄩ攢鎺ュ彛
+ ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
+ ztBaseRequst.setUserType(ZTConstants.BUSINESS);
+ ztBaseRequst.setOpenId(users.getOpenid());
+ ztBaseRequst.setToken(users.getToken());
+ usersMapper.update(new UpdateWrapper<Users>().lambda()
+ .set(Users::getOpenid,null)
+ .set(Users::getEditDate,new Date())
+ .eq(Users::getId,users.getId())
+ );
+ redisTemplate.delete(ZTConstants.BUSINESS+"_"+ users.getId());
+ return ztBaseRequst;
+ }
}
diff --git a/server/web/src/main/java/com/doumee/api/web/ApiController.java b/server/web/src/main/java/com/doumee/api/web/ApiController.java
index 64e7118..2d6d5e8 100644
--- a/server/web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -52,9 +52,9 @@
return obj != null ? (Long) obj : null;
}
protected Long getUserId() {
- if(isDebug){
- return 2L;
- }
+// if(isDebug){
+// return 2L;
+// }
Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserId_Name);
return obj != null ? (Long) obj : null;
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CatalogApi.java b/server/web/src/main/java/com/doumee/api/web/CatalogApi.java
index 7d1264f..5273bf6 100644
--- a/server/web/src/main/java/com/doumee/api/web/CatalogApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CatalogApi.java
@@ -36,10 +36,4 @@
@Autowired
public SmsEmailService smsEmailService;
- @ApiOperation(value = "C绔皬绋嬪簭-鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁")
- @PostMapping("/getZSZXCatalogs")
- public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
- return ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
- }
-
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CommonApi.java b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
index 4fd3597..11afc83 100644
--- a/server/web/src/main/java/com/doumee/api/web/CommonApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
@@ -3,6 +3,7 @@
import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaInfoResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaTreeResponse;
import com.doumee.config.annotation.LoginRequired;
@@ -60,8 +61,12 @@
}
+ @LoginRequired
@ApiOperation(value = "鑾峰彇鍖哄垝鍏ㄩ噺鏍戝舰淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getAreaTree")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<List<ZTAreaTreeResponse>> getAreaTree(@RequestBody ZTAreaListRequest ztAreaListRequest) {
if(StringUtils.isBlank(ztAreaListRequest.getPid())){
ztAreaListRequest.setPid("1");
@@ -69,6 +74,8 @@
if(StringUtils.isBlank(ztAreaListRequest.getLevel())){
ztAreaListRequest.setLevel("5");
}
+ ztAreaListRequest.setUserId(getMemberId()+"");
+ ztAreaListRequest.setUserType(ZTConstants.CUSTOMER);
List<ZTAreaTreeResponse> ztAreaInfoResponses = getZhongTaiDataService.getZhongTaiAreaTree(ztAreaListRequest);
return ApiResponse.success(ztAreaInfoResponses);
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index da00ef7..e96fd07 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -2,10 +2,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomCRMService;
-import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
-import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
-import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
-import com.doumee.biz.zbom.model.zhongtai.ZTDataDetailRequest;
+import com.doumee.biz.zbom.model.zhongtai.*;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
@@ -35,6 +32,7 @@
import java.beans.Customizer;
import java.io.InputStream;
import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -209,7 +207,10 @@
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/logOff")
public ApiResponse logOff() {
- getZhongTaiDataService.userLogout(memberService.logOff(getMemberId()));
+ ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId());
+ if(Objects.nonNull(ztBaseRequst)){
+ getZhongTaiDataService.userLogout(ztBaseRequst);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -258,18 +259,6 @@
}
- @LoginRequired
- @ApiOperation(value = "娴嬭瘯灏忕▼搴廡oken", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/testToken")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse testToken () {
- systemDictDataBiz.updWxMiniToken();
- return ApiResponse.success("鏇存柊鎴愬姛");
- }
-
-
@LoginRequired
@ApiOperation(value = "鑾峰彇鍒嗕韩灏忕▼搴忎簩缁寸爜锛堝浘鐗囨祦锛宨mg鏍囩src鎸囧畾锛�", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -297,7 +286,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<PageData<CustomerLog>> customerLogPage(@RequestBody PageWrap<CustomerLog> pageWrap) {
- pageWrap.getModel().setCostomerId(getMemberId().toString());
+ pageWrap.getModel().setMemberId(getMemberId());
pageWrap.getModel().setIsHiddenPhone(Constants.ZERO);
return ApiResponse.success(customerLogService.findPage(pageWrap));
}
@@ -312,6 +301,8 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ ztCatalogListRequest.setUserId(getMemberId()+"");
+ ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
}
@@ -325,6 +316,8 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ ztCatalogListRequest.setUserId(getMemberId()+"");
+ ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
@@ -555,7 +548,17 @@
}
-
-
+ @LoginRequired
+ @ApiOperation(value = "鎴戠殑鏀惰棌/鍠滄鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/collectLikePage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTCollectLikeInfoResponse>> collectLikePage(@RequestBody ZTCollectLikeRequest ztCollectLikeRequest) {
+ ztCollectLikeRequest.setUserId(getMemberId()+"");
+ ztCollectLikeRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTCollectLikeInfoResponse> ztBasePageResponse= getZhongTaiDataService.collectLikePage(ztCollectLikeRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
index 964a8ee..3838bec 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -2,6 +2,7 @@
import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.ZbomZhongTaiService;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
@@ -9,6 +10,7 @@
import com.doumee.dao.business.model.News;
import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
+import com.doumee.service.business.GetZhongTaiDataService;
import com.doumee.service.business.NewsService;
import com.doumee.service.business.SmsEmailService;
import io.swagger.annotations.Api;
@@ -45,11 +47,15 @@
@Autowired
public NewsService newsService;
+ @Autowired
+ public GetZhongTaiDataService getZhongTaiDataService;
+
+ @LoginRequired
@ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I")
@PostMapping("/getZSZXCatalogs")
public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
- return ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
+ return ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId()));
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 7548ae8..89748ca 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -4,6 +4,7 @@
import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
+import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
@@ -17,6 +18,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.EditMemberRequest;
import com.doumee.dao.web.reqeust.EditShopDTO;
import com.doumee.dao.web.reqeust.EditUsersRequest;
@@ -34,6 +36,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -115,9 +118,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse getUserDetail() {
- usersService.usersDetailById(getUserId());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ public ApiResponse<Users> getUserDetail() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",usersService.usersDetailById(getUserId()));
}
@UserLoginRequired
@@ -131,6 +133,7 @@
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
+
@UserLoginRequired
@ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/shopPage")
@@ -154,7 +157,7 @@
@UserLoginRequired
@ApiOperation(value = "淇敼闂ㄥ簵淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/updShop")
+ @PostMapping("/updShop")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
@@ -163,11 +166,16 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @UserLoginRequired
@ApiOperation(value = "鑾峰彇涓汉鍚嶇墖", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/getUserCard")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<String> getUserCard() {
return ApiResponse.success(usersService.getUserCard(this.getLoginUserInfo()));
}
+
@ApiOperation(value = "鑾峰彇鍐呭鍒嗕韩娴锋姤", notes = "鑾峰彇鍐呭鍒嗕韩娴锋姤锛屽姞灏忕▼搴忕爜")
@PostMapping("/getContentShareImg")
@@ -208,5 +216,20 @@
List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
-
+
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/logOff")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse logOff() {
+ ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId());
+ if(Objects.nonNull(ztBaseRequst)){
+ getZhongTaiDataService.userLogout(ztBaseRequst);
+ }
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3