|
|
@@ -16,7 +16,6 @@ import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.OrderExamineBo;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
import com.goafanti.common.dao.NewOrderChangeMapper;
|
|
|
-import com.goafanti.common.dao.NoticeMapper;
|
|
|
import com.goafanti.common.dao.OrderChangeLogMapper;
|
|
|
import com.goafanti.common.dao.OrderExamineMapper;
|
|
|
import com.goafanti.common.dao.OrderRefundInvoiceMapper;
|
|
|
@@ -36,7 +35,6 @@ import com.goafanti.common.model.TOrderDun;
|
|
|
import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.NewOrderChange;
|
|
|
-import com.goafanti.common.model.Notice;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
|
@@ -49,6 +47,7 @@ import com.goafanti.order.bo.OrderChangeLogBo;
|
|
|
import com.goafanti.order.bo.TOrderLogBo;
|
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
|
+import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
@Service
|
|
|
public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
|
|
|
@@ -81,7 +80,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
|
private AdminMapper adminMapper;
|
|
|
@Autowired
|
|
|
- private NoticeMapper noticeMapper;
|
|
|
+ private OrderNewService orderNewService;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -108,7 +107,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ocl.setRemarks(startRemarks);
|
|
|
ocl.setChangeId(ncb.getId());
|
|
|
ocl.setStatus(0);
|
|
|
- sendNotice(2, t);//设置与通过一样发送信息
|
|
|
+ sendNotice(0, t);//设置与通过一样发送信息
|
|
|
orderChangeLogMapper.insertSelective(ocl);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -223,10 +222,18 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else {
|
|
|
nb.setProcessState(rejectState);
|
|
|
nb.setStatus(3);//订单变更设置为驳回
|
|
|
+ //驳回位置查看有无审核人,没有则直接跳下一个
|
|
|
+ if (rejectState==2) {
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,0,null)<1) nb.setProcessState(nb.getProcessState()+1);
|
|
|
+ }
|
|
|
+ if (rejectState==3) {
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,1,null)<1) nb.setProcessState(nb.getProcessState()+1);
|
|
|
+ }
|
|
|
+
|
|
|
//如果驳回到技术经理之前则将审核表中状态跳回
|
|
|
- if(rejectState==3) {
|
|
|
+ if(nb.getProcessState()==3) {
|
|
|
orderExamineMapper.updateByOrderNo(orderNo,1);
|
|
|
- }else if (rejectState<3) {
|
|
|
+ }else if (nb.getProcessState()<3) {
|
|
|
orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
|
}
|
|
|
|
|
|
@@ -242,9 +249,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
|
return 1;
|
|
|
}
|
|
|
+
|
|
|
private void sendNotice(Integer status,NewOrderChangeBo nb) {
|
|
|
- //2通过 3驳回
|
|
|
- Integer type=status==2?NoticeStatus.ORDER_CHANGE_YES.getCode():NoticeStatus.ORDER_CHANGE_NO.getCode();
|
|
|
+ //0发起2通过 3驳回
|
|
|
+ Integer type=0;
|
|
|
+ if(status==0)type=NoticeStatus.ORDER_CHANGE_START.getCode();
|
|
|
+ if(status==2)type=NoticeStatus.ORDER_CHANGE_YES.getCode();
|
|
|
+ if(status==3)type=NoticeStatus.ORDER_CHANGE_NO.getCode();
|
|
|
//获取发起人与发起人部门
|
|
|
AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
//获取接收者
|
|
|
@@ -292,21 +303,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+nb.getOrderNo()+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
|
|
|
- List<Notice> nlist=new ArrayList<>();
|
|
|
- for (String string : alist) {
|
|
|
- Notice n =new Notice();
|
|
|
- n.setId(UUID.randomUUID().toString());
|
|
|
- n.setNoticeType(type);
|
|
|
- n.setContent(str);
|
|
|
- n.setReaded(0);//未读
|
|
|
- n.setAid(string);
|
|
|
- nlist.add(n);
|
|
|
- }
|
|
|
- if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
|
|
|
+ //发送站内信息与邮件
|
|
|
+ orderNewService.generalSendNoticeAndEmail(alist, type, o.getOrderNo(), a.getId());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
private void changgeAdopt(NewOrderChangeBo nb) {
|
|
|
TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
|
|
|
@@ -404,7 +404,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
|
ocl.setAuditor(TokenManager.getAdminId());
|
|
|
ocl.setOrderNo(t.getOrderNo());
|
|
|
- ocl.setRemarks(startRemarks);
|
|
|
+ ocl.setRemarks(startRemarks==null?"":startRemarks);
|
|
|
ocl.setChangeId(noc.getId());
|
|
|
ocl.setStatus(0);
|
|
|
orderChangeLogMapper.insertSelective(ocl);
|
|
|
@@ -412,6 +412,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setCwCost(t.getCwCost());
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
|
}
|
|
|
+ t.setProcessState(1);//流程置为营销管理员
|
|
|
+ sendNotice(0, t);
|
|
|
return newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|
|
|
}
|
|
|
@Override
|