Browse Source

订单日志BUG修复

anderx 3 years ago
parent
commit
de8c5cd16b

+ 4 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -522,6 +522,10 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/technicianBackOrder", method = RequestMethod.POST)
 	public Result technicianBackOrder(String orderNo,String reason){
 		Result res = new Result();
+		if (StringUtils.isBlank(reason)){
+			res.getError().add(buildError("请输入驳回原因","请输入驳回原因"));
+			return res;
+		}
 		int i=orderNewService.updatetechnicianBackOrder(orderNo, reason);
 		if (i==-1) {
 			res.getError().add(buildError("不符合驳回条件","不符合驳回条件"));

+ 6 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1089,6 +1089,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		ob.setBackStatus(0);//待处理
 		ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		ob.setAccept(tOrder.getSalesmanId());
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(orderNo);
+		tl.setProcess(OrderLogProcess.BH.getCode());
+		addOrderLog(tl,reason);
 		tOrderBackMapper.insertSelective(ob);
 	}
 
@@ -1247,17 +1251,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			type=NoticeStatus.ORDER_APPROVA_YES.getCode();
 			tl.setProcess(OrderLogProcess.TP.getCode());
+			addOrderLog(tl,reason);
 		} else {
 			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCBH.getCode());
 			else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZBH.getCode());
 			t.setOrderStatus(OrderNewState.YBH.getCode());
 			t.setProcessStatus(ProcessStatus.YPYXY.getCode());
-			addBackOrder(orderNo, reason);
 			tl.setProcess(OrderLogProcess.BH.getCode());
 			aids.add(t2.getSalesmanId());
 			type=NoticeStatus.ORDER_APPROVA_NO.getCode();
+			addBackOrder(orderNo, reason);
 		}
-		addOrderLog(tl,reason);
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
 		//新增特批催款信息