|
|
@@ -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);//未读
|