Browse Source

新增协单助手同步

anderx 3 years ago
parent
commit
4eb5774943

+ 18 - 11
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -288,7 +288,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 *  @param split 修改后客户集
 	 * @param prdList 修改前客户集
 	 * @param use 原订单信息
-	 * @param in
 	 */
 	private void  addPRD(List<String> split, List<OutPublicReleaseDetails> prdList, PublicRelease use) {
 		List<PublicReleaseDetails> addPrdList=new ArrayList<>();
@@ -937,7 +936,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 
 	private void addAssistantPublicRelease(PublicRelease p, String aid) {
-		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
+		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, null);
 		PublicRelease newP= new PublicRelease();
 		if(list.isEmpty()){
 			BeanUtils.copyProperties(p,newP);
@@ -947,20 +946,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			newP.setType(4);
 			publicReleaseMapper.insertSelective(newP);
 			addpublicReleaseDtails(p,newP.getId());
+			StringBuffer str=new StringBuffer();
+			str=str.append("公出").append("[").append(p.getUserNames()).append("]").append("邀请你协助!");
+			addWeChatNotice( aid,1,str.toString(),newP.getId());
 		}else {
 			for (PublicRelease pr : list) {
-				if (pr.getAid().equals(aid)){
 					newP.setId(pr.getId());
-					newP.setStatus(2);
+					newP.setAssistantAid(p.getAssistantAid());
+					newP.setAssistantName(p.getAssistantName());
 					publicReleaseMapper.updateByPrimaryKeySelective(newP);
 					updatePublicReleaseDtails(p,newP.getId());
-				}
-
 			}
 		}
-		StringBuffer str=new StringBuffer();
-		str=str.append("公出").append("[").append(p.getUserNames()).append("]").append("邀请你协助!");
-		addWeChatNotice( aid,1,str.toString(),newP.getId());
 	}
 
 	/**
@@ -1056,6 +1053,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		String sname = pushAssistant(aid, list,1);
 		String said =String.join(",",list);
+		p.setAssistantAid(said);
+		p.setAssistantName(sname);
 		deleteAssistantPulicRelease(p,aid);
 		return updateAssistant(p, said, sname);
 	}
@@ -1064,11 +1063,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private void deleteAssistantPulicRelease(PublicRelease p, String aid) {
 		publicReleaseMapper.updateStatusByMainId(3,4,p.getMainId(),aid);
-		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
+		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, null);
 		StringBuffer str=new StringBuffer();
 		str=str.append("公出").append("[").append(p.getUserNames()).append("]").append("撤销了你的协助!");
 		for (PublicRelease pr : list) {
-			addWeChatNotice( pr.getAid(),3,str.toString(),pr.getId());
+			if (pr.getAid().equals(aid)){
+				addWeChatNotice( pr.getAid(),3,str.toString(),pr.getId());
+			}else {
+				PublicRelease newPr=new PublicRelease();
+				newPr.setId(pr.getId());
+				newPr.setAssistantAid(p.getAssistantAid());
+				newPr.setAssistantName(p.getAssistantName());
+				publicReleaseMapper.updateByPrimaryKeySelective(newPr);
+			}
 		}
 	}