Merge remote-tracking branch 'origin/master'

admin/src/main/java/com/baiye/modules/distribute/dto/DBPushClueDTO.java

@@ -60,4 +60,9 @@ public class DBPushClueDTO {
 	 * 人工审核推送手机号, mobile就不是手机号字段了
 	 */
 	private String called;
+
+	/**
+	 * 太空猫传递的线索ID
+	 */
+	private Long variable;
 }

admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java

@@ -65,4 +65,7 @@ public class ClueEntity extends LogicDeletedBaseEntity {
 	@Schema(title = "资源线索名称")
 	private String clueStageName;
 
+	@Schema(title = "太空猫传递的线索ID")
+	private Long variable;
+
 }

admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java

@@ -39,10 +39,11 @@ public class OutsideReqServiceImpl implements OutsideReqService {
 	public void pushClue(String appKey, DBPushClueDTO dbPushClueDTO) {
 		log.info("推送appKey：{}，推送信息：{}", appKey, dbPushClueDTO);
 		if (dbPushClueDTO != null && (dbPushClueDTO.getMobile() != null || dbPushClueDTO.getCalled() != null)) {
-			String mobileDecodeStr = null;
+			String mobileDecodeStr;
 			String remark = dbPushClueDTO.getRemark();
 			String empClientTypeName = dbPushClueDTO.getEmpClientTypeName();
 			String called = dbPushClueDTO.getCalled();
+			Long variable = dbPushClueDTO.getVariable();
 
 			try {
 				if (StringUtils.isNotBlank(dbPushClueDTO.getMobile())) {
@@ -59,7 +60,7 @@ public class OutsideReqServiceImpl implements OutsideReqService {
 			}
 			// 添加线索
 			boolean bool = MobileUtil.checkPhone(mobileDecodeStr);
-			if (bool) syncTaskService.pushClueExecuteTask(appKey, mobileDecodeStr, remark);
+			if (bool) syncTaskService.pushClueExecuteTask(appKey, mobileDecodeStr, remark, variable);
 			else log.error("============号码非法============");
 		}
 	}

admin/src/main/java/com/baiye/task/SyncTaskServiceImpl.java

@@ -37,7 +37,7 @@ public class SyncTaskServiceImpl implements SyncTaskService {
 	private final DistributeTaskService distributeTaskService;
 
 	@Override
-	public void pushClueExecuteTask(String appKey, String mobile, String remark) {
+	public void pushClueExecuteTask(String appKey, String mobile, String remark, Long variable) {
 		// 查询appKey映射的记录
 		PushLinkEntity linkEntity = pushLinkService.getByAppKey(appKey);
 		if (linkEntity != null) {
@@ -48,6 +48,7 @@ public class SyncTaskServiceImpl implements SyncTaskService {
 			// clueEntity.setOtherClue(JSONUtil.toJsonStr(dbPushClueDTO));
 			clueEntity.setCreateBy(linkEntity.getCreateBy());
 			clueEntity.setRemark(remark);
+			clueEntity.setVariable(variable);
 			clueService.save(clueEntity);
 			// 执行任务
 			DistributeTaskEntity entity = distributeTaskMapper.selectOne(

admin/src/main/java/com/baiye/task/service/SyncTaskService.java

@@ -6,7 +6,7 @@ import org.springframework.scheduling.annotation.Async;
 public interface SyncTaskService {
 
 	@Async
-	void pushClueExecuteTask(String appKey, String mobile, String remark);
+	void pushClueExecuteTask(String appKey, String mobile, String remark, Long variable);
 
 	@Async
 	void clueUpload(ClueRecordEntity clueRecordEntity);