|
|
@@ -34,11 +34,13 @@ import com.goafanti.common.dao.OrganizationContactBookMapper;
|
|
|
import com.goafanti.common.dao.TDunLogMapper;
|
|
|
import com.goafanti.common.dao.TOrderBackMapper;
|
|
|
import com.goafanti.common.dao.TOrderDunMapper;
|
|
|
+import com.goafanti.common.dao.TOrderLogMapper;
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TOrderRefundMapper;
|
|
|
import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
+import com.goafanti.common.enums.OrderLogProcess;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.Notice;
|
|
|
import com.goafanti.common.model.OrganizationContactBook;
|
|
|
@@ -46,6 +48,7 @@ import com.goafanti.common.model.OrganizationManagement;
|
|
|
import com.goafanti.common.model.TDunLog;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
import com.goafanti.common.model.TOrderDun;
|
|
|
+import com.goafanti.common.model.TOrderLog;
|
|
|
import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.common.model.TOrderRefund;
|
|
|
import com.goafanti.common.model.TOrderRefundWithBLOBs;
|
|
|
@@ -98,6 +101,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Autowired
|
|
|
private AdminMapper adminMapper;
|
|
|
@Autowired
|
|
|
+ private TOrderLogMapper tOrderLogMapper;
|
|
|
+ @Autowired
|
|
|
NoticeMapper noticeMapper;
|
|
|
@Autowired
|
|
|
OrderService orderService;
|
|
|
@@ -207,12 +212,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
contactBook.setMobile(t.getContactMobile());
|
|
|
organizationContactBookMapper.insertSelective(contactBook);
|
|
|
}
|
|
|
- if (isSubmit==1) {
|
|
|
+ if (isSubmit==1) {//订单
|
|
|
t.setOrderStatus(OrderNewState.QDDS.getCode());
|
|
|
t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
|
|
|
if (t2.getApproval()==ApprovalNewState.BH.getCode()){
|
|
|
t.setApproval(ApprovalNewState.DSH.getCode());
|
|
|
}
|
|
|
+ //生成流转
|
|
|
+ addOrderLog(t.getOrderNo(),OrderLogProcess.TJ.getCode());
|
|
|
+
|
|
|
}
|
|
|
if (t2.getApproval()==ApprovalNewState.BH.getCode()||
|
|
|
t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
|
|
|
@@ -225,6 +233,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
|
|
|
|
|
|
+ public void addOrderLog(String orderNo, Integer code) {
|
|
|
+ TOrderLog tl=new TOrderLog();
|
|
|
+ tl.setOrderNo(orderNo);
|
|
|
+ tl.setProcess(code);
|
|
|
+ tl.setAid(TokenManager.getAdminId());
|
|
|
+ tOrderLogMapper.insertSelective(tl);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public TOrderNewBo getOrderNewDetail(String orderNo) {
|
|
|
TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
|
|
|
@@ -311,10 +330,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
t.setOrderNo(orderNo);
|
|
|
if (orderStatus==OrderNewState.QDSHTG.getCode()&&t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
|
|
|
t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.SH.getCode());
|
|
|
+ }else if (orderStatus==OrderNewState.QDSHTG.getCode()&&t2.getApproval()==ApprovalNewState.DSH.getCode()) {
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.SH.getCode());
|
|
|
}
|
|
|
if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
addBackOrder(orderNo, reason);
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.BH.getCode());
|
|
|
}
|
|
|
t.setOrderStatus(orderStatus);
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
@@ -403,6 +426,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tOrder.setOrderNo(t.getOrderNo());
|
|
|
tOrder.setOrderStatus(OrderNewState.TDZ.getCode());
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ addOrderLog(t.getOrderNo(), OrderLogProcess.FQTD.getCode());
|
|
|
return tOrderRefundMapper.insertSelective(t);
|
|
|
}
|
|
|
|
|
|
@@ -415,10 +439,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (confirm==2) {
|
|
|
t.setApproval(2);
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.TP.getCode());
|
|
|
} else {
|
|
|
t.setApproval(3);
|
|
|
t.setOrderStatus(OrderNewState.YBH.getCode());
|
|
|
addBackOrder(orderNo, reason);
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.BH.getCode());
|
|
|
}
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|