新建商机提示优化

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -1495,6 +1495,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
     }
     }
 
 
     private CommonResult isCreateOpportunity(OwnOpportunityBasicInformationSaveRequestVO requestVO) {
     private CommonResult isCreateOpportunity(OwnOpportunityBasicInformationSaveRequestVO requestVO) {
+        Long assignedPractitionerId = requestVO.getAssignedPractitionerId();
         Long customerId;
         Long customerId;
         //当指派id为null时,认为是保存新的商机
         //当指派id为null时,认为是保存新的商机
         //校验商机号码,手机号码对应的customer是否存在
         //校验商机号码,手机号码对应的customer是否存在
@@ -1508,13 +1509,23 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             mktLeadsAssigneds.setCustomerId(aclCustomer.getId());
             mktLeadsAssigneds.setCustomerId(aclCustomer.getId());
             List<MktLeadsAssigneds> mktLeadsAssignedsList = mktLeadsAssignedsDALService.findByMktLeadsAssigneds(mktLeadsAssigneds);
             List<MktLeadsAssigneds> mktLeadsAssignedsList = mktLeadsAssignedsDALService.findByMktLeadsAssigneds(mktLeadsAssigneds);
             if (!mktLeadsAssignedsList.isEmpty()){
             if (!mktLeadsAssignedsList.isEmpty()){
+
                 MktLeadsAssignedTrack leadsAssignedTrack = mktLeadsAssignedTrackDALService.findByListNotesForCustomerId(aclCustomer.getId());
                 MktLeadsAssignedTrack leadsAssignedTrack = mktLeadsAssignedTrackDALService.findByListNotesForCustomerId(aclCustomer.getId());
                 Long mdDropOptionId = leadsAssignedTrack.getMdDropOptionId();
                 Long mdDropOptionId = leadsAssignedTrack.getMdDropOptionId();
                 //判断最后一条跟进状态是否为失败,是失败则无需判断经纪人id和之前是否一致
                 //判断最后一条跟进状态是否为失败,是失败则无需判断经纪人id和之前是否一致
                 MdDropOptions mdDropOption = mdDropOptionsDALService.findById(mdDropOptionId);
                 MdDropOptions mdDropOption = mdDropOptionsDALService.findById(mdDropOptionId);
                 if (!"refused".equalsIgnoreCase(mdDropOption.getDropOptionCode())){
                 if (!"refused".equalsIgnoreCase(mdDropOption.getDropOptionCode())){
-                    //跳出错误
-                    return new CommonResult(false,ZHBErrorConfig.getErrorInfo("830014"));
+                    //获取最新track对应的leads
+                    for (MktLeadsAssigneds item : mktLeadsAssignedsList) {
+                        if (item.getId().equals(leadsAssignedTrack.getLeadsAssignedId())) {
+                            //跳出错误
+                            if (item.getAssignedPractitionerId().equals(assignedPractitionerId)) {
+                                return new CommonResult(false,ZHBErrorConfig.getErrorInfo("该商机已存在"));
+                            } else {
+                                return new CommonResult(false,ZHBErrorConfig.getErrorInfo("830014"));
+                            }
+                        }
+                    }
                 }
                 }
             }
             }
         }else {
         }else {