|
@@ -81,7 +81,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
* 查询【请填写功能名称】列表
|
|
* 查询【请填写功能名称】列表
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
|
- public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
|
|
|
|
|
|
|
+ public TableDataInfo list(Long itemId, String promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
|
|
|
String consignee, Long itemCreateId, Long collectSampleId, String courierNumber, String collectSampleDesc, String fieId, String sort, Integer mediaId) {
|
|
String consignee, Long itemCreateId, Long collectSampleId, String courierNumber, String collectSampleDesc, String fieId, String sort, Integer mediaId) {
|
|
|
TableDataInfo tableDataInfo = new TableDataInfo();
|
|
TableDataInfo tableDataInfo = new TableDataInfo();
|
|
|
try {
|
|
try {
|
|
@@ -557,7 +557,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/copyInfo")
|
|
@GetMapping("/copyInfo")
|
|
|
- public JSONObject copyInfo(Long promoterId) {
|
|
|
|
|
|
|
+ public JSONObject copyInfo(String promoterId) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
try {
|
|
try {
|
|
|
if (Check.isNull(promoterId)) {
|
|
if (Check.isNull(promoterId)) {
|
|
@@ -606,7 +606,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
export.add(date.getString("promoterId"));
|
|
export.add(date.getString("promoterId"));
|
|
|
export.add(date.getString("promoterNickName"));
|
|
export.add(date.getString("promoterNickName"));
|
|
|
export.add(date.getString("status"));
|
|
export.add(date.getString("status"));
|
|
|
- JSONObject copyJson = kuaishouItemCollectSamplesService.getCopyInfo(date.getLong("promoterId"));
|
|
|
|
|
|
|
+ JSONObject copyJson = kuaishouItemCollectSamplesService.getCopyInfo(date.getString("promoterId"));
|
|
|
if (!Check.isNull(copyJson)) {
|
|
if (!Check.isNull(copyJson)) {
|
|
|
export.add(copyJson.getString("fansNumber"));
|
|
export.add(copyJson.getString("fansNumber"));
|
|
|
export.add(copyJson.getString("totalSale"));
|
|
export.add(copyJson.getString("totalSale"));
|
|
@@ -714,7 +714,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
public TableDataInfo queryProductList(
|
|
public TableDataInfo queryProductList(
|
|
|
@ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId,
|
|
@ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId,
|
|
|
@ApiParam("商品标题") @RequestParam(value = "itemTitle", required = false) String itemTitle,
|
|
@ApiParam("商品标题") @RequestParam(value = "itemTitle", required = false) String itemTitle,
|
|
|
- @ApiParam("达人id") @RequestParam(value = "promoterId", required = false) Long promoterId,
|
|
|
|
|
|
|
+ @ApiParam("达人id") @RequestParam(value = "promoterId", required = false) String promoterId,
|
|
|
@ApiParam("达人昵称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
|
|
@ApiParam("达人昵称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
|
|
|
@ApiParam("商品单价起始价") @RequestParam(value = "reservePriceStart", required = false) Double reservePriceStart,
|
|
@ApiParam("商品单价起始价") @RequestParam(value = "reservePriceStart", required = false) Double reservePriceStart,
|
|
|
@ApiParam("商品单价结束价") @RequestParam(value = "reservePriceEnd", required = false) Double reservePriceEnd,
|
|
@ApiParam("商品单价结束价") @RequestParam(value = "reservePriceEnd", required = false) Double reservePriceEnd,
|