|
|
@@ -249,16 +249,50 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
return excel.exportExcel(list,"订单流水列表",response);
|
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/waitingMerge",method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "/waitingMerge",method = RequestMethod.POST)
|
|
|
public Result waitingMerge(String ids){
|
|
|
- Result res=new Result();
|
|
|
- if (ids==null||ids.isEmpty()){
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"回款编号"));
|
|
|
- return res;
|
|
|
+ Result res=new Result();
|
|
|
+ if (ids==null||ids.isEmpty()){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"回款编号"));
|
|
|
+ return res;
|
|
|
}
|
|
|
- res.data(orderReceivablesService.pushWaitingMerge(ids));
|
|
|
- return res;
|
|
|
+ res.data(orderReceivablesService.pushWaitingMerge(ids));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 匹配
|
|
|
+ * @param value 匹配数据值
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/matchingOrderNo",method = RequestMethod.GET)
|
|
|
+ public Result matchingOrderNo(String value){
|
|
|
+ Result res=new Result();
|
|
|
+ if (value==null){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"数据值"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.data(orderReceivablesService.matchingOrderNo(value));
|
|
|
+ return res;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 匹配
|
|
|
+ * @param value 匹配数据值
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/matchingUser",method = RequestMethod.GET)
|
|
|
+ public Result matchingUser(String value){
|
|
|
+ Result res=new Result();
|
|
|
+
|
|
|
+ if (value==null){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"数据值"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.data(orderReceivablesService.matchingUser(value));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}
|