|
@@ -17,12 +17,10 @@ import com.cyksj.dto.CorpOauth2UserInfo;
|
|
|
import com.cyksj.dto.Result;
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.GroupsRelationExpiryRecordMapper;
|
|
import com.cyksj.mapper.GroupsRelationExpiryRecordMapper;
|
|
|
|
|
+import com.cyksj.mapper.UserMapper;
|
|
|
import com.cyksj.mapper.corp.CorpUserTagMapper;
|
|
import com.cyksj.mapper.corp.CorpUserTagMapper;
|
|
|
import com.cyksj.model.dto.AuthRedirect;
|
|
import com.cyksj.model.dto.AuthRedirect;
|
|
|
-import com.cyksj.model.entity.CorpCustomerAcquistionCallback;
|
|
|
|
|
-import com.cyksj.model.entity.CorpFollow;
|
|
|
|
|
-import com.cyksj.model.entity.CorpMsgFollowAssociation;
|
|
|
|
|
-import com.cyksj.model.entity.QyMsgContent;
|
|
|
|
|
|
|
+import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.manage.views.CorpQyMsgAuditChatView;
|
|
import com.cyksj.model.manage.views.CorpQyMsgAuditChatView;
|
|
|
import com.cyksj.model.request.corp.CorpCommonReq;
|
|
import com.cyksj.model.request.corp.CorpCommonReq;
|
|
|
import com.cyksj.model.views.CorpUserIntentionView;
|
|
import com.cyksj.model.views.CorpUserIntentionView;
|
|
@@ -34,6 +32,7 @@ import com.cyksj.service.corp.CorpUserService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
import com.ejlchina.searcher.SearchResult;
|
|
|
import com.ejlchina.searcher.param.Operator;
|
|
import com.ejlchina.searcher.param.Operator;
|
|
|
|
|
+import com.ejlchina.searcher.util.MapBuilder;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -78,6 +77,8 @@ public class WxCorpController {
|
|
|
|
|
|
|
|
private final CorpUserTagMapper corpUserTagMapper;
|
|
private final CorpUserTagMapper corpUserTagMapper;
|
|
|
|
|
|
|
|
|
|
+ private final UserMapper userMapper;
|
|
|
|
|
+
|
|
|
private final static String CORP_UUID = "corp-uuid";
|
|
private final static String CORP_UUID = "corp-uuid";
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -316,8 +317,15 @@ public class WxCorpController {
|
|
|
* @Param unionId 用户unionId
|
|
* @Param unionId 用户unionId
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/acquistionLinkCallback")
|
|
@GetMapping("/acquistionLinkCallback")
|
|
|
- public Result<CorpCustomerAcquistionCallback> getAcquistionLinkCallback() {
|
|
|
|
|
- CorpCustomerAcquistionCallback corpCustomerAcquistionCallback = beanSearcher.searchFirst(CorpCustomerAcquistionCallback.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
|
|
|
|
+ public Result<CorpCustomerAcquistionCallback> getAcquistionLinkCallback(Long userId) {
|
|
|
|
|
+ MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
|
|
+ if (userId != null) {
|
|
|
|
|
+ User user = userMapper.selectById(userId);
|
|
|
|
|
+ if (user != null && StrUtil.isNotBlank(user.getUnionid())) {
|
|
|
|
|
+ builder.field(CorpCustomerAcquistionCallback::getUnionId, user.getUnionid());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ CorpCustomerAcquistionCallback corpCustomerAcquistionCallback = beanSearcher.searchFirst(CorpCustomerAcquistionCallback.class, builder.build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(corpCustomerAcquistionCallback);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(corpCustomerAcquistionCallback);
|
|
|
}
|
|
}
|
|
|
|
|
|