Browse Source

新增开票日志,修改新增、修改、审核、特批审核等接口。

anderx 3 years ago
parent
commit
d03c4ea9a7

+ 25 - 36
src/main/java/com/goafanti/order/controller/OrderInvoiceApiController.java

@@ -21,14 +21,12 @@ import com.goafanti.order.service.OrderInvoiceService;
 @RestController
 @RequestMapping(value = "/api/admin/orderInvoice")
 public class OrderInvoiceApiController extends CertifyApiController {
-	
+
 	@Autowired
 	private OrderInvoiceService		orderInvoiceService;
-	
+
 	/**
 	 * 创建发票申请
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/createOrderInvoice",method = RequestMethod.POST)
@@ -50,12 +48,10 @@ public class OrderInvoiceApiController extends CertifyApiController {
 		res.data(orderInvoiceService.createServiceOrder(t));
 		return res;
 	}
-	
-	
+
+
 	/**
 	   *   发票申请详情
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/selectByIdOrderInvoice",method = RequestMethod.GET)
@@ -65,14 +61,12 @@ public class OrderInvoiceApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","ID"));
 			return res;
 		}
-		
+
 		res.data(orderInvoiceService.selectByIdOrderInvoice(id));
 		return res;
 	}
 	/**
 	 * 获取最新开票详情
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/getInvoiceDetails",method = RequestMethod.GET)
@@ -82,14 +76,12 @@ public class OrderInvoiceApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		
+
 		res.data(orderInvoiceService.getInvoiceDetails(orderNo));
 		return res;
 	}
 	/**
 	 * 修改发票申请
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrderInvoice",method = RequestMethod.POST)
@@ -110,42 +102,36 @@ public class OrderInvoiceApiController extends CertifyApiController {
 		res.data(orderInvoiceService.updateServiceOrder(t));
 		return res;
 	}
-	
-	
+
+
 	/**
 	 *  财务开票列表
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/financeOrderInvoiceList",method = RequestMethod.GET)
 	public Result financeOrderInvoiceList(InputOrderInvoiceBo o,Integer pageNo,Integer pageSize){
 		Result res = new Result();
-		
+
 		res.data(orderInvoiceService.financeOrderInvoiceList( o,pageNo,pageSize));
 		return res;
 	}
-	
-	
-	
+
+
+
 	/**
 	 *  开票特批列表
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/approvalOrderInvoiceList",method = RequestMethod.GET)
 	public Result approvalOrderInvoiceList(Integer status,Integer approval,Integer type,String orderDep,String orderNo ,String name,String userName,Integer pageNo,Integer pageSize){
 		Result res = new Result();
-		
+
 		res.data(orderInvoiceService.approvalOrderInvoiceList( status,approval,type, orderDep, orderNo, name,userName,pageNo,pageSize));
 		return res;
 	}
-	
+
 	/**
 	 *   开票审核
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/financeExamine",method = RequestMethod.POST)
@@ -163,11 +149,9 @@ public class OrderInvoiceApiController extends CertifyApiController {
 		res.data(orderInvoiceService.updatefinanceExamine( id, examine, reason));
 		return res;
 	}
-	
+
 	/**
 	 *   特批审核
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/approvalExamine",method = RequestMethod.POST)
@@ -185,11 +169,9 @@ public class OrderInvoiceApiController extends CertifyApiController {
 		res.data(orderInvoiceService.updateapprovalExamine( id, examine, reason));
 		return res;
 	}
-	
+
 	/**
 	 *   订单开票列表
-	 * @param uid
-	 * @param orderType
 	 * @return
 	 */
 	@RequestMapping(value = "/salesmanOrderInvoiceList",method = RequestMethod.GET)
@@ -202,7 +184,7 @@ public class OrderInvoiceApiController extends CertifyApiController {
 		res.data(orderInvoiceService.salesmanOrderInvoiceList(  orderNo, pageNo,pageSize));
 		return res;
 	}
-	
+
 	/** 开票文件上传 **/
 	@RequestMapping(value = "/uploadOrderInvoiceFile", method = RequestMethod.POST)
 	public Result uploadOrderInvoiceFile(HttpServletRequest req,String sign){
@@ -211,5 +193,12 @@ public class OrderInvoiceApiController extends CertifyApiController {
 		res.setData(handleFile(res, "/order_invoice_file/", false, req, sign));
 		return res;
 	}
-	
+
+	@RequestMapping(value = "/invoice/log",method = RequestMethod.GET)
+	public Result InvoiceLog(Integer id){
+		Result res = new Result();
+		res .data(orderInvoiceService.InvoiceLog(id));
+		return res;
+	}
+
 }