|
|
@@ -1443,22 +1443,24 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
|
|
|
addMemberLog(tOrderTask.getId(),0,"新增会员项目");
|
|
|
if(memberType!=null){
|
|
|
- addMemberExamine(tOrderTask.getOrderNo());
|
|
|
- addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
|
|
|
+ addMemberExamine(tOrderTask);
|
|
|
+ addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask,null,0);
|
|
|
addFinanceCountMember(tOrderTask.getOrderNo(),date);
|
|
|
}
|
|
|
return tb;
|
|
|
}
|
|
|
|
|
|
- private void addMemberExamine(String orderNo) {
|
|
|
- OrganizationListOut dep = tOrderNewMapper.selectOrderFinance(orderNo);
|
|
|
+
|
|
|
+
|
|
|
+ private void addMemberExamine(TOrderTask t) {
|
|
|
+ OrganizationListOut dep = tOrderNewMapper.selectOrderFinance(t.getOrderNo());
|
|
|
List<TOrderExamine> list=new ArrayList<>();
|
|
|
if(!Objects.isNull(dep)){
|
|
|
if (!Objects.isNull(dep.getFinanceId())){
|
|
|
- list.add(new TOrderExamine(orderNo,1,dep.getFinanceId(),dep.getFinanceName()));
|
|
|
+ list.add(new TOrderExamine(t.getOrderNo(),1,t.getId(),dep.getFinanceId(),dep.getFinanceName()));
|
|
|
}
|
|
|
if (!Objects.isNull(dep.getRetrialFinanceId())){
|
|
|
- list.add(new TOrderExamine(orderNo,1,dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
|
|
|
+ list.add(new TOrderExamine(t.getOrderNo(),1,t.getId(),dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
|
|
|
}
|
|
|
}
|
|
|
tOrderExamineMapper.insertBatch(list);
|
|
|
@@ -1482,20 +1484,25 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public void addNoticMember(Integer type, String orderNo,Integer shiroType,Integer result) {
|
|
|
- TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);
|
|
|
- addNoticMember(type,tn,shiroType,result);
|
|
|
+
|
|
|
+ public void addNoticMember(Integer type, TOrderTask tOrderTask,Integer shiroType,Integer result) {
|
|
|
+ TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(tOrderTask.getOrderNo());
|
|
|
+ addNoticMember(type,tn,shiroType,result,tOrderTask);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void addNoticMember(Integer type, TOrderNewBo b,Integer shiroType,Integer result) {
|
|
|
+ public void addNoticMember(Integer type, TOrderNewBo b, Integer shiroType, Integer result) {
|
|
|
+ addNoticMember(type,b,shiroType,result,null);
|
|
|
+ }
|
|
|
+
|
|
|
+ public void addNoticMember(Integer type, TOrderNewBo b,Integer shiroType,Integer result,TOrderTask tOrderTask) {
|
|
|
StringBuffer sb=new StringBuffer();
|
|
|
String aid=null;
|
|
|
List<Admin>admins=new ArrayList<>();
|
|
|
sb.append("客户名称【").append(b.getUserName()).append("】,订单编号【").append(b.getOrderNo()).append("】,");
|
|
|
if (type.equals(NoticeStatus.MENBER_START.getCode())){
|
|
|
sb=sb.append("发起会员项目,请及时审核");
|
|
|
- pushTOrderExamineAid(b.getOrderNo(),admins);
|
|
|
+ pushTOrderExamineAid(tOrderTask.getId(),admins);
|
|
|
}else if (type.equals(NoticeStatus.MENBER_YES.getCode())){
|
|
|
sb=sb.append("会员项目审核");
|
|
|
if(shiroType==0){
|
|
|
@@ -1538,8 +1545,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void pushTOrderExamineAid(String orderNo, List<Admin> admins) {
|
|
|
- List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(orderNo, 1);
|
|
|
+ private void pushTOrderExamineAid(Integer tid, List<Admin> admins) {
|
|
|
+ List<TOrderExamine> list = tOrderExamineMapper.selectByTid(tid);
|
|
|
for (TOrderExamine e : list) {
|
|
|
Admin admin = new Admin();
|
|
|
admin.setId(e.getAid());
|