anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
f277ed176e

+ 3 - 0
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -66,6 +66,9 @@ public enum NoticeStatus {
 	ITEM_CHECK_START(57,"发起专利核对"),
 	ITEM_CHECK_END(58,"完成专利核对"),
 	MENBER_DUN(59,"会员催款信息"),
+	MENBER_START(60,"会员项目发起"),
+	MENBER_YES(60,"会员项目通过"),
+	MENBER_NO(60,"会员项目拒绝"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 3 - 3
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -265,7 +265,7 @@ public class OrderDunTask {
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderReceivables(tm.getOrderReceivables());
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b,null);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
@@ -288,7 +288,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b,null);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setOrderArrears(tm.getOrderArrears());
@@ -312,7 +312,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b,null);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setOrderReceivables(tm.getOrderReceivables());

+ 2 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -214,8 +214,8 @@ public interface OrderNewService {
 	 * @param b 订单信息
 	 *
 	 */
-	void addNotic(Integer type,  TOrderNewBo b);
-
+	void addNotic(Integer type,  TOrderNewBo b,String str);
+	void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType);
 	Pagination<TOrderNewBo> statisticsOrderList(InputStatisticsOrderList in);
 
 	int updateSalesType(TOrderNew in);

+ 58 - 7
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -222,6 +222,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tl.setProcess(OrderLogProcess.HYXMFQ.getCode());
 		tl.setAid(TokenManager.getAdminId());
 		addOrderLog(tl,"发起会员项目");
+		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null);
 		return addOrderTask( t);
 	}
 
@@ -769,7 +771,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
-		addNotic(NoticeStatus.ORDER_DUN.getCode(), b);
+		addNotic(NoticeStatus.ORDER_DUN.getCode(), b,null);
 		try {
 			NewDunsendEmail(o.getOrderNo(),o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
@@ -788,7 +790,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}else {
 			sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
 		}
-		addNotic(noticType, b,o,sb.toString());
+		addNotic(noticType, b,sb.toString());
 		try {
 			NewDunsendEmail(o.getOrderNo(),o.getId(), a, b,noticType,sb.toString());
 		} catch (UnsupportedEncodingException | MessagingException e) {
@@ -1188,19 +1190,68 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public void addNotic(Integer type,  TOrderNewBo b) {
+	public void addNotic(Integer type,  TOrderNewBo b,String str) {
+		String aid=null;
 		StringBuffer sb=new StringBuffer();
-		sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
-		addNotic(type,b,null,sb.toString());
+		if (str==null){
+			if (type==NoticeStatus.ORDER_ARREARS_DUN.getCode()||type==NoticeStatus.PAYMENT_DUN.getCode()||type==NoticeStatus.ORDER_DUN.getCode()){
+				sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
+				aid=b.getSalesmanId();
+			}
+		}else {
+			sb=sb.append(str);
+		}
+
+		addNotic(type,aid,sb.toString());
 	}
 
+	@Override
+	public void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType) {
+		StringBuffer sb=new StringBuffer();
+		String aid=null;
+		List<Admin>admins=null;
+		if (type==NoticeStatus.MENBER_START.getCode()){
+			sb=sb.append("客户名称[").append(b.getUserName()).append("],发起会员项目,请及时审核");
+			aid=b.getFinanceId();
+		}else if (type==NoticeStatus.MENBER_YES.getCode()){
+			sb=sb.append("客户名称[").append(b.getUserName()).append("],会员项目审核");
+			if(shiroType==0){
+				sb=sb.append("财务已通过。");
+				admins=adminMapper.getAdminRoleList("总裁");
+			} else if(shiroType==1){
+				sb=sb.append("特批已通过。");
+				aid=b.getSalesmanId();
+			}
+		}else if (type==NoticeStatus.MENBER_YES.getCode()){
+			sb=sb.append("客户名称[").append(b.getUserName()).append("],会员项目");
+			if(shiroType==0){
+				sb=sb.append("财务已驳回。");
+			} else if(shiroType==1){
+				sb=sb.append("特批已驳回。");
+			}
+			aid=b.getSalesmanId();
+		}
+		if (admins.size()>0){
+			for (Admin admin : admins) {
+				addNotic(type,admin.getId(),sb.toString());
+			}
+		}else {
+			addNotic(type,aid,sb.toString());
+		}
+	}
 
 
-	public void addNotic(Integer type,  TOrderNewBo b,OutNewOrderDunBo o,String str) {
+	/**
+	 *
+	 * @param type 通知类型
+	 * @param aid 被通知人
+	 * @param str 信息
+	 */
+	public void addNotic(Integer type, String  aid,String str) {
 
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
-		n.setAid(b.getSalesmanId());
+		n.setAid(aid);
 		n.setNoticeType(type);
 		n.setContent(str);
 		n.setReaded(0);//未读

+ 6 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -658,7 +658,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(pnb.getOrderNo());
-		orderNewService.addNotic(type,b);
+		orderNewService.addNotic(type,b,null);
 		pn.setDunStatus(1);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		//营销员名称、邮箱、订单编号、客户名称
@@ -1094,6 +1094,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		log.setAid(TokenManager.getAdminId());
 		TOrderTask nt=new TOrderTask();
 		nt.setId(task.getId());
+		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		// 1=通过 0=驳回
 		if (in.getResult()==1){
 			//0=财务 1=特批
@@ -1113,6 +1114,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				log.setProcess(20);
 				addLog(log,1);
 			}
+				orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType());
 		}else if (in.getResult()==0){
 			if (in.getType()==0){
 				log.setProcess(21);
@@ -1121,6 +1123,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}
 			addLog(log,0);
 			nt.setProcessStatus(4);
+			orderNewService.addNoticMember(NoticeStatus.MENBER_NO.getCode(), ono, in.getType());
 		}
 		return tOrderTaskMapper.updateByPrimaryKeySelective(nt);
 	}
@@ -1144,6 +1147,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		addOrderLog(task.getOrderNo(),OrderLogProcess.HYXMFQ.getCode(), "修改重新发起");
 		t.setProcessStatus(1);
+		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
+		orderNewService.addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null);
 		return orderNewService.updateOrderTask(t);
 	}