|
@@ -79,7 +79,9 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
* 查询【请填写功能名称】列表
|
|
|
*/
|
|
|
@GetMapping("/list")
|
|
|
- public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone) {
|
|
|
+ public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
|
|
|
+ String consignee
|
|
|
+ ) {
|
|
|
TableDataInfo tableDataInfo = new TableDataInfo();
|
|
|
try {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
@@ -117,12 +119,15 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
if (!Check.isNull(promoterPhone)) {
|
|
|
requestMap.put("promoterPhone", promoterPhone);
|
|
|
}
|
|
|
+ if (!Check.isNull(consignee)) {
|
|
|
+ requestMap.put("consignee", consignee);
|
|
|
+ }
|
|
|
startPage();
|
|
|
List<KuaishouItemCollectSamples> list = kuaishouItemCollectSamplesService.selectKuaishouItemCollectSamplesList(requestMap);
|
|
|
return getDataTable(list);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- tableDataInfo.setCode(-1);
|
|
|
+ tableDataInfo.setCode(500);
|
|
|
tableDataInfo.setMsg(e.getMessage());
|
|
|
}
|
|
|
return tableDataInfo;
|
|
@@ -186,7 +191,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("message", "领样信息增加成功");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -268,14 +273,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("message", "修改成功");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@PutMapping("/update")
|
|
|
public JSONObject update(@RequestBody KuaishouItemCollectSamples kuaishouItemCollectSamples) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
@@ -290,14 +294,11 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("message", "修改成功");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
|
|
|
@GetMapping("/detail")
|
|
@@ -312,7 +313,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("message", "查询成功");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -331,7 +332,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("message", "查询成功");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -360,7 +361,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("message", "调用成功");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -430,7 +431,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("data", copyJson);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -520,7 +521,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
return kuaishouItemCollectSamplesService.getPersonalInfo(userId, type);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", -500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -541,7 +542,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
return kuaishouItemCollectSamplesService.getOrderData(userId, startDate, endDate, type);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|
|
@@ -559,7 +560,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
return kuaishouItemCollectSamplesService.getDataAnalysis(userId, type);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- returnJson.put("code", -1);
|
|
|
+ returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
|
return returnJson;
|