|
|
@@ -44,7 +44,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectServiceOrder(bo, startDate, endDate, intention, formal, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 订单详细
|
|
|
* @param orderNo
|
|
|
@@ -60,7 +60,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectServiceOrderDetail(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 修改订单
|
|
|
* @param orderNo
|
|
|
@@ -92,7 +92,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderRemarks,contractPictureUrl);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 签单
|
|
|
* @param orderNo
|
|
|
@@ -142,12 +142,12 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
fbb.setUid(uid);
|
|
|
fbb.setContactType(AFTConstants.DEFAULT_CONTACT_TYPE);
|
|
|
fbb.setResult(AFTConstants.DEFAULT_RESULT);
|
|
|
- fbb.setUserBusinessList(list);
|
|
|
+ fbb.setUserBusinessList(list);
|
|
|
orderServiceImpl.addBusinessProjectId(fbb);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- /**
|
|
|
+
|
|
|
+ /**
|
|
|
* 订单详情
|
|
|
* @param orderNo
|
|
|
* @return
|
|
|
@@ -162,7 +162,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectServiceOrderDetail(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 确认意向
|
|
|
* @param orderNo
|
|
|
@@ -179,7 +179,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateConfirmIntention(orderNo,confirm);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 作废订单
|
|
|
* @param orderNo
|
|
|
@@ -195,19 +195,19 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateRevokeOrder(orderNo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 模糊查询业务项目
|
|
|
* @param businessName
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getBusinessProjectByName", method = RequestMethod.GET)
|
|
|
- public Result getBusinessProjectByName(String businessName,String cid){
|
|
|
+ public Result getBusinessProjectByName(String businessName,String cname){
|
|
|
Result res = new Result();
|
|
|
- res.setData(businessProjectServiceImpl.selectBusinessProjectByName(businessName,cid));
|
|
|
+ res.setData(businessProjectServiceImpl.selectBusinessProjectByName(businessName,cname));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询业务项目分类
|
|
|
* @return
|
|
|
@@ -218,7 +218,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(businessProjectServiceImpl.selectBusinessProjectCatalog());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 获取订单商品信息
|
|
|
* @param orderNo
|
|
|
@@ -230,11 +230,11 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectOrderCommodity(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 添加订单商品
|
|
|
- * @param orderNo
|
|
|
+ * @param orderNo
|
|
|
* @param commodityId
|
|
|
* @param commodityMode
|
|
|
* @param commodityQuantity
|
|
|
@@ -255,7 +255,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
commodityPrice,discountPrice,commodityFirstPayment,discountFirstPayment,remarks);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 进入修改商品信息
|
|
|
* @param id
|
|
|
@@ -268,10 +268,10 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","明细ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 修改订单商品
|
|
|
* @param detailId
|
|
|
@@ -292,7 +292,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateOrderCommodity(detailId,discountPrice, discountFirstPayment,commodityQuantity, remarks);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除订单商品
|
|
|
* @param detailId
|
|
|
@@ -308,7 +308,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.deleteOrderCommodity(detailId);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询分管部门
|
|
|
* @return
|
|
|
@@ -319,7 +319,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectMyDeps());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 部门服务订单
|
|
|
* @return
|
|
|
@@ -331,7 +331,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectDepServiceOrder(bo, startDate, endDate, intention, formal, depIds, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询特批订单
|
|
|
* @return
|
|
|
@@ -343,7 +343,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectApprovalServiceOrder(bo, startDate, endDate, depIds, approvalHistory, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 审批特批订单
|
|
|
* @param orderNo
|
|
|
@@ -355,9 +355,9 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateApprovalServiceOrder(orderNo,confirm);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
|
|
|
/** 图片上传 **/
|
|
|
@RequestMapping(value = "/uploadOrderImg", method = RequestMethod.POST)
|
|
|
@@ -366,7 +366,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(handleFile(res, "/order_file/", false, req, sign));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 查询公共订单 **/
|
|
|
@RequestMapping(value = "/listPublicOrder", method = RequestMethod.POST)
|
|
|
public Result listPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize){
|
|
|
@@ -374,7 +374,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectPublicOrder(bo,startDate,endDate,pageNo,pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 分配订单到营销员 **/
|
|
|
@RequestMapping(value = "/appointSalesman", method = RequestMethod.GET)
|
|
|
public Result appointSalesman(String orderNo,String salesmanId){
|
|
|
@@ -401,7 +401,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
TokenManager.getAdminId(), financeName, orderStatus, liquidationStatus, approval,null,startDate,endDate, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 结算订单管理 **/
|
|
|
@RequestMapping(value = "/listAllSettlement", method = RequestMethod.POST)
|
|
|
public Result listAllSettlement(String orderNo, String depId,String buyerName,String salesmanName, String financeName,
|
|
|
@@ -412,29 +412,29 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
"", financeName, orderStatus, liquidationStatus, approval,isDistributionFinance, startDate,endDate, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 我的订单流水管理 **/
|
|
|
@RequestMapping(value = "/listMyBill", method = RequestMethod.POST)
|
|
|
public Result selectMyBillList(String payeeName, String payerName, String depId,
|
|
|
String salesmanName,String orderNo, Integer confirmSign,Integer deleteSign,Integer pageNo, Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
- res.setData(orderServiceImpl.selectMyBillList(payeeName, payerName, depId, salesmanName,orderNo,
|
|
|
+ res.setData(orderServiceImpl.selectMyBillList(payeeName, payerName, depId, salesmanName,orderNo,
|
|
|
confirmSign, deleteSign, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
/** 我的订单流水查询 **/
|
|
|
@RequestMapping(value = "/queryMyBill", method = RequestMethod.POST)
|
|
|
public Result queryMyBillList(String payeeName, String payerName, String depId,
|
|
|
String salesmanName,String orderNo, Integer confirmSign,Integer deleteSign,Integer pageNo, Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
- res.setData(orderServiceImpl.queryMyBillList(payeeName, payerName, depId, salesmanName,orderNo,
|
|
|
+ res.setData(orderServiceImpl.queryMyBillList(payeeName, payerName, depId, salesmanName,orderNo,
|
|
|
confirmSign, deleteSign, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/** 所有订单流水查询 **/
|
|
|
@RequestMapping(value = "/queryAllBill", method = RequestMethod.POST)
|
|
|
public Result queryAllBill(String payeeName, String payerName, String depId,
|
|
|
@@ -443,7 +443,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.queryAllBillList(payeeName, payerName, depId, salesmanName,financeName, orderNo,confirmSign,deleteSign, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 查询流水详情 **/
|
|
|
@RequestMapping(value = "/selectBillDetail", method = RequestMethod.GET)
|
|
|
public Result selectBillDetail(String billNo){
|
|
|
@@ -455,7 +455,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectBillDetail(billNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 订单流水确认
|
|
|
* @param billNo
|
|
|
@@ -489,7 +489,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateBill(billNo,orderNo,confirm,financialPayNo,financialPayTime,remarks);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 修改流水
|
|
|
* @param billNo
|
|
|
@@ -512,7 +512,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateBill(billNo, orderNo,financialPayNo, financialPayTime, remarks);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 订单支付(测试用)
|
|
|
* @return
|
|
|
@@ -527,7 +527,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updatePayForTest(orderNo, payAmount);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 订单退款(测试用)
|
|
|
* @param orderNo
|
|
|
@@ -544,7 +544,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateRefundForTest(orderNo, refundAmount);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 派单
|
|
|
* @param orderNo
|
|
|
@@ -594,7 +594,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectBillByOrderNo(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 确认退款
|
|
|
* @param orderNo
|
|
|
@@ -611,7 +611,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.updateConfirmRefund(orderNo,confirm);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 转交订单
|
|
|
* @param orderNo
|
|
|
@@ -659,7 +659,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.addOrderChange(orderNo,changeComment,taskList,dunList);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查看变更记录
|
|
|
* @param orderNo
|
|
|
@@ -675,7 +675,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
res.setData(orderServiceImpl.selectOrderChange(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除变更
|
|
|
* @param changeId
|
|
|
@@ -691,7 +691,7 @@ public class AdminOrderApiController extends CertifyApiController {
|
|
|
orderServiceImpl.deleteOrderChange(changeId);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 更新变更记录
|
|
|
* @param changeComment
|