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 ); 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(); 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 ;//地址详情 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
@@ -10,6 +10,10 @@ *用户临时票据 */ private String token; /** * 有效期 秒 */ private Long expire; } 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; }
@@ -274,7 +274,4 @@ } } } 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 = "【C端小程序】获取首页志说装修四个模块类目数据", notes = "获取首页志说装修四个模块类目数据，背景图暂时写死，参考UI") @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)); } } 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)); } }
