|
|
@@ -1,13 +1,5 @@
|
|
|
package com.goafanti.order.controller;
|
|
|
|
|
|
-import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-
|
|
|
-import javax.annotation.Resource;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
-
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
@@ -21,6 +13,13 @@ import com.goafanti.order.bo.OrderRefundBo;
|
|
|
import com.goafanti.order.service.FundManageOrderService;
|
|
|
import com.goafanti.order.service.OrderBillService;
|
|
|
import com.goafanti.order.service.OrderRefundService;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
+
|
|
|
+import javax.annotation.Resource;
|
|
|
+import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/financial")
|
|
|
@@ -31,7 +30,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
private OrderBillService orderBillServiceImpl;
|
|
|
@Resource
|
|
|
private OrderRefundService orderRefundServiceImpl;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务管理员查看所有待分配的订单
|
|
|
* @param order >> outsource 0否 1外包
|
|
|
@@ -46,7 +45,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.setData(fundManageOrderServiceImpl.allUnassignedOrder(order, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务管理员分派订单
|
|
|
* @param financeId
|
|
|
@@ -67,7 +66,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务专员查看分配给自己的订单
|
|
|
* @param order >> outsource 0否 1外包
|
|
|
@@ -82,7 +81,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.setData(fundManageOrderServiceImpl.financeList(order, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务专员驳回
|
|
|
* @param orderBack
|
|
|
@@ -103,7 +102,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务收款
|
|
|
* 财务专员新增流水记录并流转订单状态
|
|
|
@@ -117,7 +116,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError("", "备注长度不能大于255"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(contractNo)) {
|
|
|
res.getError().add(buildError("", "合同编号不能为空!"));
|
|
|
return res;
|
|
|
@@ -148,7 +147,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
/**
|
|
|
- * 财务审核
|
|
|
+ * 财务审核通过
|
|
|
*/
|
|
|
@RequestMapping(value="/financeApproval", method = RequestMethod.POST)
|
|
|
public Result financeApproval(String orderNo,String remarks) {
|
|
|
@@ -159,7 +158,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo,remarks));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务专员查看自己要处理的退单数据
|
|
|
* @param refund
|
|
|
@@ -177,7 +176,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderRefundServiceImpl.getRefundList(refund, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务专员审核退款
|
|
|
* @param refund
|
|
|
@@ -198,7 +197,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务专员新增退款流水
|
|
|
* @param orderRefund
|
|
|
@@ -228,7 +227,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 根据id查看订单流水数据
|
|
|
* @return
|
|
|
@@ -239,7 +238,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.setData(fundManageOrderServiceImpl.selectOneRefundFlow(billNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 根据订单编号查看该订单相关的所有流水
|
|
|
* @param orderNo
|
|
|
@@ -251,7 +250,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.setData(fundManageOrderServiceImpl.selectOneOrderAllRefundFlow(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 财务专员查看自己的流水
|
|
|
* @param billNew
|
|
|
@@ -268,7 +267,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 删除流水
|
|
|
- *
|
|
|
+ *
|
|
|
*/
|
|
|
@RequestMapping(value="/deleteMyBill", method = RequestMethod.GET)
|
|
|
public Result deleteMyBill(String billNo){
|
|
|
@@ -289,9 +288,9 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderBillServiceImpl.myBillList(billNew,pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 修改合同编号
|
|
|
* @param orderNew
|