|
|
@@ -143,11 +143,11 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
*
|
|
|
*/
|
|
|
@RequestMapping(value ="/batchImport",method = RequestMethod.POST)
|
|
|
- public Result batchImport(){
|
|
|
+ public Result batchImport(Integer mergeStatus){
|
|
|
LoggerUtils.debug(getClass(), "=========================开始批量导入===================");
|
|
|
Result res = new Result();
|
|
|
int i=0;
|
|
|
- i=orderReceivablesService.batchImport();
|
|
|
+ i=orderReceivablesService.batchImport( mergeStatus);
|
|
|
if (i==-1) {
|
|
|
throw new BusinessException(new Error("未找到正确的回款信息。"));
|
|
|
}
|
|
|
@@ -265,7 +265,7 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
* @param value 匹配数据值
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/matchingOrderNo",method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "/matchingOrderNo",method = RequestMethod.GET)
|
|
|
public Result matchingOrderNo(String value){
|
|
|
Result res=new Result();
|
|
|
if (value==null){
|
|
|
@@ -281,7 +281,7 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
* @param value 匹配数据值
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/matchingUser",method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "/matchingUser",method = RequestMethod.GET)
|
|
|
public Result matchingUser(String value){
|
|
|
Result res=new Result();
|
|
|
|