From a68a91af2eadd014405c25a549ece1fb7bbcba2e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 10:04:44 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectInfoResponse.java | 55 +++++++++
server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java | 6
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusFavoritesInfoResponse.java | 31 +++++
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMDaogouBindListResponse.java | 2
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 63 ++++++++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 6 +
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBehaviorInfoResponse.java | 38 ++++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java | 11 +
server/service/src/main/java/com/doumee/dao/business/model/CustomerUser.java | 16 ++
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 7
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java | 7 -
server/web/src/main/java/com/doumee/api/web/CatalogApi.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java | 21 ++-
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 42 +++++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java | 27 ++++
17 files changed, 309 insertions(+), 29 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 03ec1a6..0b41ced 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
@@ -29,10 +29,11 @@
boolean likeDo(ZTActionBatchDoRequest param);
boolean shareDo(ZTActionDoRequest param);
boolean viewDo(ZTActionDoRequest param);
- ZTBasePageResponse<ZTContentListResponse> pageCollectList(ZTContentListRequest param);
+ ZTBasePageResponse<ZTCollectInfoResponse> pageCollectList(ZTContentListRequest param);
ZTBasePageResponse<ZTContentListResponse> pageLikeList(ZTContentListRequest param);
+ ZTBasePageResponse<ZTBehaviorInfoResponse> pageBehavoirList(ZTContentListRequest param);
List<ZTAreaInfoResponse> getAreaList(ZTAreaListRequest param);
-
-
+ boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param);
ZSZXCatalogResponse getZSZXCatalogs();
+ ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
index cc65fde..bd00ca2 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
@@ -8,8 +8,6 @@
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
import com.doumee.biz.zbom.model.crm.response.CRMDaogouBindListResponse;
-import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
-import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
@@ -27,11 +25,6 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.net.URLEncoder;
import java.util.*;
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 d1663dd..2837a38 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
@@ -279,19 +279,76 @@
return false;
}
/**
+ * 鐢ㄦ埛缁戝畾瀹㈡埛鍠滄娓呭崟锛屽彲缁戝畾澶氫釜鍐呭
+ * @param param
+ * @return
+ */
+ @Override
+ public boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param){
+ ZTBaseResponse result = sendHttpRequest(
+ ZTConstants.IntegerUrl.BIND_CUSTOMER_FAVORITES_URL,
+ ZTConstants.IntegerName.BIND_CUSTOMER_FAVORITES_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+ if(result!=null ){
+ return true;
+ }
+ return false;
+ }
+ /**
* 鑾峰彇鎴戠殑鏀惰棌鍒楄〃鍒嗛〉
* @param param
* @return
*/
@Override
- public ZTBasePageResponse<ZTContentListResponse> pageCollectList(ZTContentListRequest param){
- ZTBaseResponse< ZTBasePageResponse<ZTContentListResponse>> result = sendHttpRequest(
+ public ZTBasePageResponse<ZTCollectInfoResponse> pageCollectList(ZTContentListRequest param){
+ ZTBaseResponse< ZTBasePageResponse<ZTCollectInfoResponse>> result = sendHttpRequest(
ZTConstants.IntegerUrl.COLLECT_LIST_URL,
ZTConstants.IntegerName.COLLECT_LIST_NAME,
param.getToken(),
param.getUserType(),
JSONObject.toJSONString(param ),
- new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTContentListResponse>>>(){});
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTCollectInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇鎴戠殑鏀惰棌鍒楄〃鍒嗛〉
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBasePageResponse<ZTBehaviorInfoResponse> pageBehavoirList(ZTContentListRequest param){
+ ZTBaseResponse< ZTBasePageResponse<ZTBehaviorInfoResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.BEHAVIOR_LIST_URL,
+ ZTConstants.IntegerName.BEHAVIOR_LIST_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTBehaviorInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇瀹㈡埛鍠滄
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param){
+ ZTBaseResponse< ZTBasePageResponse<ZTCusFavoritesInfoResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.CUSTOMER_FAVORITES_LIST_URL,
+ ZTConstants.IntegerName.CUSTOMER_FAVORITES_LIST_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>>>(){});
if(result!=null){
return result.getData();
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
index a9d4c8b..dd1c850 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
@@ -13,7 +13,7 @@
private String dgName ;//瀵艰喘鍚嶇О
private String dgPhone ;//瀵艰喘鎵嬫満鍙风爜
private String orgName ;//缁勭粐鍚嶇О
- private String useName;// 鐢ㄦ埛鐧诲綍璐﹀彿
+ private String userName;// 鐢ㄦ埛鐧诲綍璐﹀彿
private String userId ;//鐢ㄦ埛id涓婚敭
private String productCodeName;// 浜у搧鍚嶇О
private String customerPhone;// 瀹㈡埛濮撳悕
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMDaogouBindListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMDaogouBindListResponse.java
index e0222ab..70c4cd8 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMDaogouBindListResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMDaogouBindListResponse.java
@@ -13,7 +13,7 @@
private String dgName ;//瀵艰喘鍚嶇О
private String dgPhone ;//瀵艰喘鎵嬫満鍙风爜
private String orgName ;//缁勭粐鍚嶇О
- private String useName;// 鐢ㄦ埛鐧诲綍璐﹀彿
+ private String userName;// 鐢ㄦ埛鐧诲綍璐﹀彿
private String userId ;//鐢ㄦ埛id涓婚敭
private String productCodeName;// 浜у搧鍚嶇О
private String customerPhone;// 瀹㈡埛濮撳悕
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 6b05d39..048701c 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
@@ -17,7 +17,7 @@
private String userType;
@ApiModelProperty(value = "token" , hidden = true)
private String token;
- private String openid;
+ private String openId;
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭" , hidden = true)
private Long 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
new file mode 100644
index 0000000..2a6849f
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java
@@ -0,0 +1,27 @@
+package com.doumee.biz.zbom.model.zhongtai;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 鐢ㄦ埛鏀惰棌銆佹祻瑙堛�佺偣璧炪�佸垎浜�+1
+ */
+@Data
+public class ZTBindCusFavoriteDoRequest extends ZTBaseRequst {
+ /**
+ * 鍐呭ID鍒楄〃
+ */
+ private List<String> articleIds;
+ /**
+ * OpenID
+ */
+ private String openId;
+ /**
+ * 鐢ㄦ埛ID
+ */
+ 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 ace2b3b..abedc76 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
@@ -39,6 +39,9 @@
String COLLECT_LIST_URL ="/behavior/getFavorite";
String LIKE_LIST_URL ="/behavior/getLike";
String AREA_LIST_URL ="/base/admin/bAreaRegion/getChildren";
+ String BIND_CUSTOMER_FAVORITES_URL ="/behavior/api/bindCustomerFavorites";
+ String CUSTOMER_FAVORITES_LIST_URL ="/behavior/api/customerFavorites";
+ String BEHAVIOR_LIST_URL ="/behavior/api/customerBehaviors";
}
public interface IntegerName{
String USER_UPDATE_NAME ="鐢ㄦ埛淇℃伅鍚屾";
@@ -55,5 +58,8 @@
String COLLECT_LIST_NAME ="鑾峰彇鎴戠殑鏀惰棌鍒楄〃鍒嗛〉";
String LIKE_LIST_NAME ="鑾峰彇鎴戠殑鍠滄鍒楄〃鍒嗛〉";
String AREA_LIST_NAME ="鑾峰彇鐪佸競鍖洪泦鍚�";
+ String BIND_CUSTOMER_FAVORITES_NAME ="缁戝畾瀹㈡埛鍠滄";
+ String CUSTOMER_FAVORITES_LIST_NAME ="鑾峰彇瀹㈡埛鍠滄";
+ String BEHAVIOR_LIST_NAME ="鑾峰彇琛屼负杞ㄨ抗";
}
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java
index 0f195e7..5736989 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java
@@ -7,6 +7,7 @@
*/
@Data
public class ZTUserInfoUpdateRequest extends ZTBaseRequst{
+
/**
* 鍦板潃锛岀渷甯傚尯鐨勫畬鏁村瓧绗︿覆锛屾瘮濡�"骞夸笢鐪佸箍宸炲競鐧戒簯鍖�"
*/
@@ -20,7 +21,7 @@
*/
private String appCode;
/**
- * 搴旂敤ID锛屽皬绋嬪簭鐨凙ppID 蹇呴渶
+ * 搴旂敤ID锛屽皬绋嬪簭鐨凙ppID
*/
private String appId;
/**
@@ -77,7 +78,11 @@
*/
private String name;
/**
- * OpenID锛屽井淇＄敤鎴风殑OpenID 蹇呴渶
+ * 鏄电О
+ */
+ private String nickname;
+ /**
+ * OpenID锛屽井淇＄敤鎴风殑OpenID
*/
private String openId;
/**
@@ -85,7 +90,7 @@
*/
private String phone;
/**
- * 骞冲彴绫诲瀷锛屽皬绋嬪簭浼爉p-weixin锛宲ad绔紶web-pad 蹇呴渶
+ * 骞冲彴绫诲瀷锛屽皬绋嬪簭浼爉p-weixin锛宲ad绔紶web-pad
*/
private String platform;
/**
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
index fedcead..ba905a5 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
+import com.fasterxml.jackson.annotation.JsonAlias;
import lombok.Data;
import java.io.Serializable;
@@ -8,19 +9,23 @@
@Data
public class ZTBasePageResponse<T> implements Serializable {
/**
- * 褰撳墠椤�
- */
- private double current;
- /**
* 璁板綍鍒楄〃
*/
+ @JsonAlias(value = {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
private List<T> records;
/**
- * 姣忛〉鏄剧ず鏉℃暟
+ * 褰撳墠椤�
*/
- private double size;
+ @JsonAlias(value = {"pageCount","pageNum"})
+ private String pageNum;
/**
- * 鎬昏褰曟暟
+ * 姣忛〉鏉℃暟
*/
- private double total;
+ @JsonAlias(value = {"pageSize",})
+ private String pageSize;
+ /**
+ * 鎬绘暟
+ */
+ @JsonAlias(value = {"totalCount","total"})
+ private String total;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBehaviorInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBehaviorInfoResponse.java
new file mode 100644
index 0000000..3f353e9
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBehaviorInfoResponse.java
@@ -0,0 +1,38 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 鍐呭鍒嗛〉鍒楄〃杩斿洖鍐呭
+ */
+@Data
+public class ZTBehaviorInfoResponse implements Serializable {
+ /**
+ * 琛屼负绫诲瀷锛宲raise-鐐硅禐锛�
+ * praise_cancel-鐐硅禐鍙栨秷,
+ * collect-鏀惰棌,
+ * collect_cancel-鏀惰棌鍙栨秷,
+ * view-鏌ョ湅,
+ * share-鍒嗕韩,
+ * download-涓嬭浇,
+ * like-鍠滄,
+ * like_cancel-鍙栨秷鍠滄
+ */
+ private String actionType;
+ /**
+ * 鍐呭ID
+ */
+ private String contentId;
+ /**
+ * 鍙戠敓鏃堕棿锛寉yyy-MM-dd HH:mm:ss
+ */
+ private String createTime;
+ /**
+ * 鏍囬
+ */
+ private String title;
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectInfoResponse.java
new file mode 100644
index 0000000..dbd7ab3
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectInfoResponse.java
@@ -0,0 +1,55 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 鍐呭鍒嗛〉鍒楄〃杩斿洖鍐呭
+ */
+@Data
+public class ZTCollectInfoResponse implements Serializable {
+ /**
+ * 鏀惰棌鏁�
+ */
+ private String collectCount;
+ /**
+ * 鍐呭ID
+ */
+ private String contentId;
+ /**
+ * 鍐呭鏍囬
+ */
+ private String contentTitle;
+ /**
+ * 鍐呭灏侀潰
+ */
+ private String coverImage;
+ /**
+ * 鏀惰棌鍒涘缓鏃堕棿
+ */
+ private String createTime;
+ /**
+ * 涓嬭浇鏁�
+ */
+ private String downloadCount;
+ /**
+ * 鍐呭璺宠浆URL锛屾棤璺宠浆鍒欎负绌哄瓧绗︿覆
+ */
+ private String jumpUrl;
+ /**
+ * 鐐硅禐鏁�
+ */
+ private String praiseCount;
+ /**
+ * 鍒嗕韩鏁�
+ */
+ private String shareCount;
+ /**
+ * 鏌ョ湅鏁�
+ */
+ private String viewCount;
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusFavoritesInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusFavoritesInfoResponse.java
new file mode 100644
index 0000000..6054903
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusFavoritesInfoResponse.java
@@ -0,0 +1,31 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 鐢ㄦ埛閫�鍑�
+ */
+@Data
+public class ZTCusFavoritesInfoResponse implements Serializable {
+ /**
+ * 鍐呭ID
+ */
+ private String contentId;
+ /**
+ * 灏侀潰URL
+ */
+ private String cover;
+ /**
+ * 鍠滄鏃堕棿锛寉yyy-MM-dd HH:mm:ss
+ */
+ private String favoriteTime;
+ /**
+ * 鏍囬
+ */
+ private String title;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CustomerUser.java b/server/service/src/main/java/com/doumee/dao/business/model/CustomerUser.java
index d8d0286..910efeb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CustomerUser.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CustomerUser.java
@@ -96,4 +96,20 @@
@ExcelColumn(name="鍒涘缓鏃ユ湡")
private String creationDate ;//鏃堕棿 yyyy-MM-dd
+ @ApiModelProperty(value = "鏉ユ簮 0灏忕▼搴� 1涓彴", example = "1")
+ @ExcelColumn(name="鏉ユ簮 0灏忕▼搴� 1涓彴")
+ private Integer source;
+ @ApiModelProperty(value = "涓彴鎻愪氦鐘舵�� 0鏈彁浜� 1宸叉彁浜� 2鎻愪氦澶辫触", example = "1")
+ @ExcelColumn(name="涓彴鎻愪氦鐘舵�� 0鏈彁浜� 1宸叉彁浜� 2鎻愪氦澶辫触")
+ private Integer ztStatus;
+
+ @ApiModelProperty(value = "涓彴鎻愪氦鏃堕棿")
+ @ExcelColumn(name="涓彴鎻愪氦鏃堕棿")
+ private Date ztDate;
+
+ @ApiModelProperty(value = "涓彴鎻愪氦澶囨敞")
+ @ExcelColumn(name="涓彴鎻愪氦澶囨敞")
+ private String ztInfo;
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
index a753f89..bd783e7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
@@ -234,7 +234,10 @@
model.setOrgName(data.getOrgName());
model.setCustomerName(data.getCustomerName());
model.setCustomerPhone(data.getCustomerPhone());
- model.setUsername(data.getUseName());
+ model.setUsername(data.getUserName());
+ model.setSource(Constants.ONE);
+ model.setZtStatus(Constants.ONE);
+ model.setZtInfo("crm鍚屾");
model.setIamUserId(data.getUserId());
model.setUserId(user== null?null:user.getId());
model.setCreationDate(data.getCreationDate());
@@ -246,6 +249,7 @@
*/
customerUserMapper.update(null,new UpdateWrapper<CustomerUser>().lambda()
.in(CustomerUser::getPhone,phoneList)
+ .eq(CustomerUser::getZtStatus,Constants.ONE)
.eq(CustomerUser::getIsdeleted,Constants.ZERO)
.set(CustomerUser::getIsdeleted,Constants.ONE)
);
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 c620d4b..5926997 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
@@ -26,7 +26,7 @@
@Api(tags = "鍒嗙被鍜屾爣绛剧浉鍏虫帴鍙�")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/personnel")
+@RequestMapping("/web/catalog")
@Slf4j
public class CatalogApi extends ApiController{
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
new file mode 100644
index 0000000..1e284a3
--- /dev/null
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -0,0 +1,42 @@
+package com.doumee.api.web;
+
+import com.doumee.biz.zbom.ZbomZhongTaiService;
+import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.web.response.ZSZXCatalogResponse;
+import com.doumee.service.business.SmsEmailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/10 18:06
+ */
+@Api(tags = "銆怋绔皬绋嬪簭銆戝鎴风鐞嗘帴鍙�")
+@Trace(exclude = true)
+@RestController
+@RequestMapping("/web/customer")
+@Slf4j
+public class CustomerManageApi extends ApiController{
+
+ @Autowired
+ public ZbomZhongTaiService zbomZhongTaiService;
+
+ @Autowired
+ public SmsEmailService smsEmailService;
+
+
+ @ApiOperation(value = "C绔皬绋嬪簭-鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁")
+ @PostMapping("/getZSZXCatalogs")
+ public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
+ return ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
+ }
+
+}
--
Gitblit v1.9.3