From b0dedcd347483e3370336c890e3d026f2ff28617 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 10:11:32 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java | 4 ++
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 3 -
server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java | 2
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java | 12 +++--
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 4 --
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java | 1
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 22 +++++++----
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 19 +++++----
8 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
index f927232..6d6d882 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
@@ -22,7 +22,7 @@
int dealCustomerLogData(CustomerLog customerLog);
String zbomEncode(String str);
- String getCrmGoUrl(String userName);
+ String getCrmGoUrl(String userName,Integer type);
CRMBaseResponse<List<CRMCustomerListResponse>> getCustomerList(CrmCustomerListRequest entity );
CRMBaseResponse<List<CRMDaogouBindListResponse>> getDaogouBindList(CrmDaogouBindListRequest entity );
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 52ea66f..a6e2c74 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
@@ -242,18 +242,20 @@
* @return
*/
@Override
- public String getCrmGoUrl(String userName){
- StringBuffer sb = new StringBuffer();
- String result = null;
+ public String getCrmGoUrl(String userName,Integer type){
try {
// 鍒涘缓StringBuffer瀵硅薄鐢ㄦ潵鎿嶄綔瀛楃涓�
int _t = (int)(System.currentTimeMillis());
+ String pageKey ="mp";//瀹㈡埛鍒楄〃椤甸潰鐮�
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ pageKey = "mpAddIntention";//鏂板鎰忓悜椤甸潰鐮�
+ }
String appkey = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_AUTH_API_KEY);
- String url = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_API_URL)
+ String url = redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_API_URL)
+CRMConstants.IntegerUrl.GO_CRM_AUTH_URL
+ "?timestamp="+_t
+"&agent_phone_number=" + URLEncoder.encode(userName, "UTF-8")
- + "&bindKey=mp&sign="+ DigestUtils.md5Hex( _t + appkey);;
+ + "&bindKey="+pageKey+"&sign="+ DigestUtils.md5Hex( _t + appkey);;
return url;
}catch (Exception e){
e.printStackTrace();
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 dd1c850..9214dc7 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
@@ -16,6 +16,7 @@
private String userName;// 鐢ㄦ埛鐧诲綍璐﹀彿
private String userId ;//鐢ㄦ埛id涓婚敭
private String productCodeName;// 浜у搧鍚嶇О
+ private String channel;// 娓犻亾淇℃伅
private String customerPhone;// 瀹㈡埛濮撳悕
private String customerName;// 瀹㈡埛鎵嬫満鍙�
private String address ;//鍦板潃璇︽儏
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
index 7c622c8..2be1a77 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
@@ -10,6 +10,10 @@
*鐢ㄦ埛涓存椂绁ㄦ嵁
*/
private String token;
+ /**
+ * 鏈夋晥鏈� 绉�
+ */
+ private Long expire;
}
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 9caf811..77f40a5 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
@@ -454,14 +454,15 @@
param.setOpenId(member.getOpenid());
ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
if(Objects.nonNull(ztUserGetTokenResponse)){
+ Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
member.setToken(ztUserGetTokenResponse.getToken());
- //TODO 鏆傛棤杩囨湡鏃ユ湡
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getToken,ztUserGetTokenResponse.getToken())
+ .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
- return ztBaseInfoResponse;
}else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(member.getToken());
@@ -482,20 +483,22 @@
ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
if(Objects.nonNull(ztUserGetTokenResponse)){
users.setToken(ztUserGetTokenResponse.getToken());
- //TODO 鏆傛棤杩囨湡鏃ユ湡
+ Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getToken,ztUserGetTokenResponse.getToken())
+ .set(Users::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Users::getId,users.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
return ztBaseInfoResponse;
}else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(users.getToken());
- return ztBaseInfoResponse;
+// return ztBaseInfoResponse;
}else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
}
+ return ztBaseInfoResponse;
}
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 dc15110..00ae70a 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
@@ -274,7 +274,4 @@
}
}
-
-
-
}
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 22c3422..f491ad3 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
@@ -7,12 +7,12 @@
import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.service.business.SmsEmailService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
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;
+import org.springframework.web.bind.annotation.*;
/**
* Created by IntelliJ IDEA.
@@ -39,13 +39,19 @@
@ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I")
@PostMapping("/getZSZXCatalogs")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
return ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
}
- @ApiOperation(value = "銆愮灏忕▼搴忋�戣幏鍙栧鎴风鐞嗘巿鏉冭烦杞湴鍧�", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
- @PostMapping("/getCrmAuthUrl")
- public ApiResponse<String> getCrmAuthUrl() {
- return ApiResponse.success(zbomCRMService.getCrmGoUrl(this.getLoginUserInfo().getIamUsername()));
+ @ApiOperation(value = "銆愮灏忕▼搴忋�戣幏鍙栧鎴风鐞嗘巿鏉�-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
+ @GetMapping("/getCrmAuthUrl")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0瀹㈡埛鍒楄〃 1璺宠浆鏂板鎰忓悜瀹㈡埛", required = true)
+ })
+ public ApiResponse<String> getCrmAuthUrl(@RequestParam Integer type) {
+ return ApiResponse.success(zbomCRMService.getCrmGoUrl(this.getLoginUserInfo().getIamUsername(),type));
}
-
}
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 42bac63..dc10841 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
@@ -107,7 +107,6 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
@UserLoginRequired
@ApiOperation(value = "鏇存柊涓汉淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/editUsers")
@@ -119,8 +118,6 @@
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
-
-
@UserLoginRequired
@ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/shopPage")
@@ -163,6 +160,5 @@
public ApiResponse<String> getContentShareImg(@RequestBody ContentShareImgDto param) {
return ApiResponse.success(usersService.getContentShareImg(this.getLoginUserInfo(),param));
}
-
}
--
Gitblit v1.9.3