Browse Source

修改订单项目修改时,处理子项数据

anderx 3 years ago
parent
commit
4bae19b6f2

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

@@ -125,10 +125,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res.data(orderNewService.updateOrderTask(t));
 	}
 
-
-
-
-
 	/**
 	 * 删除订单项目
 	 */
@@ -141,6 +137,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res.data(orderNewService.delectOrderTask(id));
 	}
+
 	/**
 	 * 删除订单
 	 */
@@ -174,6 +171,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.setData(orderNewService.selectOrderTask(orderNo,type));
 		return res;
 	}
+
 	/**
 	 * 提交订单、发起订单
 	 */
@@ -187,7 +185,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return updateServiceOrder( t, 1, signDate);
 	}
 
-
 	/**
 	 * 修改订单
 	 */
@@ -269,6 +266,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res;
 
 	}
+
 	/**
 	 * 收款截点编辑
 	 */
@@ -282,6 +280,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.setData(orderNewService.createOrderDun(orderDun,orderNo));
 		return res;
 	}
+
 	/**
 	 * 查看订单收款截点
 	 */
@@ -370,6 +369,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.arrearsDunList(in));
 		return res;
 	}
+
 	/**
 	 * 新增催款记录
 	 */
@@ -387,6 +387,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.createDunLog(dunId, dumTime, remarks,attUrl));
 		return res;
 	}
+
 	/**
 	 * 催款记录查询
 	 */
@@ -400,6 +401,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.data(orderNewService.selectDunLogList(dunId));
 			return res;
 	}
+
 	/**
 	 * 订单退单
 	 */
@@ -425,6 +427,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.data(orderNewService.addOrderRefund(t));
 			return res;
 	}
+
 	/**
 	 * 退单详情
 	 */
@@ -438,6 +441,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.data(orderNewService.orderRefundDetail(id));
 			return res;
 	}
+
 	/**
 	 * 订单退单
 	 */
@@ -459,6 +463,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.data(orderNewService.updateOrderRefund(t));
 			return res;
 	}
+
 	/**
 	 * 审批特批订单
 	 * @param orderNo
@@ -481,6 +486,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res.data(orderNewService.updateApprovalOrder(orderNo,confirm,reason));
 	}
+
 	/**
 	 * 退单列表
 	 */
@@ -491,10 +497,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-
-
-
-
 	/**
 	 * 订单结单
 	 */
@@ -513,6 +515,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.setData(i);
 		return res;
 	}
+
 	/**
 	 * 咨询师驳回订单
 	 */
@@ -526,6 +529,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res;
 	}
+
 	/**
 	 * 财务订单转交
 	 */
@@ -574,10 +578,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-
-
-
-
 	/**
 	 * 催款列表下载
 	 * @throws IOException
@@ -589,6 +589,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return orderNewService.exportOrderDunData( name, orderNo,contractNo, starTime, endTime,specially, aid, adminName, depId,newStatus
 				, approval, amountStatus, memberType,pageNo, pageSize);
 	}
+
 	/**
 	 * 	项目列表下载
 	 * @throws IOException
@@ -600,7 +601,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		 return  excel.exportExcel(list,"订单项目列表",response);
 	}
 
-
 	/**
 	 * 	催款信息下载
 	 * @throws IOException
@@ -687,7 +687,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return excelUtil.exportExcel(list,"签单省份统计表",uploadPath,sb.substring(0,sb.toString().length()-1));
 	}
 
-
 	/**
 	 * 新增协单人员
 	 * @param in
@@ -711,6 +710,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res.data(orderAssistService.addAssist(in));
 	}
+
 	/**
 	 * 删除订单协单人员
 	 * @return