|
|
@@ -214,28 +214,20 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Override
|
|
|
public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
|
|
|
List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
|
|
|
- for (NewOrderChangeBo noc : list) {
|
|
|
-// List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(noc.getOrderNo(),0);
|
|
|
-// List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(noc.getOrderNo(),1);
|
|
|
- int isExamine=orderExamineMapper.selectByOrderNoAndAid(noc.getOrderNo(),TokenManager.getAdminId());
|
|
|
-// noc.setConsultantExamine(consultantExamine);
|
|
|
-// noc.setManagerExamine(managerExamine);
|
|
|
- if (noc.getVoucherUrl()!=null) {
|
|
|
- TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
|
|
|
- noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
|
|
|
- }
|
|
|
- noc.setIsExamine(isExamine);
|
|
|
- }
|
|
|
+// for (NewOrderChangeBo noc : list) {
|
|
|
+// int isExamine=orderExamineMapper.selectByOrderNoAndAid(noc.getOrderNo(),TokenManager.getAdminId());
|
|
|
+// if (noc.getVoucherUrl()!=null) {
|
|
|
+// TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
|
|
|
+// noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
|
|
|
+// }
|
|
|
+// noc.setIsExamine(isExamine);
|
|
|
+// }
|
|
|
return list;
|
|
|
}
|
|
|
@Override
|
|
|
public NewOrderChangeBo orderChangeDetailsById(Integer id) {
|
|
|
NewOrderChangeBo nb=newOrderChangeMapper.selectById(id);
|
|
|
-// List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(nb.getOrderNo(),0);
|
|
|
-// List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(nb.getOrderNo(),1);
|
|
|
int isExamine=orderExamineMapper.selectByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId());
|
|
|
-// nb.setConsultantExamine(consultantExamine);
|
|
|
-// nb.setManagerExamine(managerExamine);
|
|
|
nb.setIsExamine(isExamine);
|
|
|
if(nb.getProcessState()!=null){
|
|
|
TOrderNew t=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
@@ -633,7 +625,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setChangeAmount(t.getChangeAmount());
|
|
|
noc.setApplicant(t.getApplicant());
|
|
|
noc.setStatus(1);//订单置为正常
|
|
|
- noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
+ TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
+ if (tOrderNew.getManagerName()!=null){
|
|
|
+ noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
+ }else {
|
|
|
+ noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
+ }
|
|
|
noc.setDepName(t.getDepName());
|
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
|
ocl.setAuditor(TokenManager.getAdminId());
|