zoujiajian il y a 2 ans
Parent
commit
3fc0214de7

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/CorpCustomerAcquistionCallback.java

@@ -33,7 +33,7 @@ public class CorpCustomerAcquistionCallback extends BaseEntity {
     private Boolean status;
 
     /**
-     * 意向 0无意向1有意向2很有意向
+     * 意向 0无回复、1无意向、2问相关问题、3有意向、4很有意向
      */
     private Integer intention;
 }

+ 14 - 6
netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/WxCorpController.java

@@ -17,12 +17,10 @@ import com.cyksj.dto.CorpOauth2UserInfo;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsRelationExpiryRecordMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.corp.CorpUserTagMapper;
 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.request.corp.CorpCommonReq;
 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.SearchResult;
 import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -78,6 +77,8 @@ public class WxCorpController {
 
 	private final CorpUserTagMapper corpUserTagMapper;
 
+	private final UserMapper userMapper;
+
 	private final static String CORP_UUID = "corp-uuid";
 
 	/**
@@ -316,8 +317,15 @@ public class WxCorpController {
 	 * @Param unionId 用户unionId
 	 */
 	@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);
 	}