|
@@ -1,9 +1,5 @@
|
|
|
package com.ruixuan.isc.controller;
|
|
package com.ruixuan.isc.controller;
|
|
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.kuaishou.merchant.open.api.KsMerchantApiException;
|
|
import com.kuaishou.merchant.open.api.KsMerchantApiException;
|
|
@@ -14,6 +10,8 @@ import com.ruixuan.common.core.domain.AjaxResult;
|
|
|
import com.ruixuan.common.core.page.TableDataInfo;
|
|
import com.ruixuan.common.core.page.TableDataInfo;
|
|
|
import com.ruixuan.common.enums.BusinessType;
|
|
import com.ruixuan.common.enums.BusinessType;
|
|
|
import com.ruixuan.common.utils.Check;
|
|
import com.ruixuan.common.utils.Check;
|
|
|
|
|
+import com.ruixuan.common.utils.poi.ExcelUtil;
|
|
|
|
|
+import com.ruixuan.isc.entity.JYOrderItemList;
|
|
|
import com.ruixuan.isc.entity.KuaishouAccessToken;
|
|
import com.ruixuan.isc.entity.KuaishouAccessToken;
|
|
|
import com.ruixuan.isc.entity.KuaishouItemList;
|
|
import com.ruixuan.isc.entity.KuaishouItemList;
|
|
|
import com.ruixuan.isc.service.IAccessTokenService;
|
|
import com.ruixuan.isc.service.IAccessTokenService;
|
|
@@ -24,7 +22,21 @@ import com.ruixuan.system.service.ISysRoleService;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.PathVariable;
|
|
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.PutMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
+import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
+
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -535,7 +547,7 @@ public class KuaishouItemListController extends BaseController {
|
|
|
) {
|
|
) {
|
|
|
try {
|
|
try {
|
|
|
startPage();
|
|
startPage();
|
|
|
- List<JSONObject> list = kuaishouItemListService.getJYOrderItemList(startDate, endDate);
|
|
|
|
|
|
|
+ List<JYOrderItemList> list = kuaishouItemListService.getJYOrderItemList(startDate, endDate);
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -543,5 +555,17 @@ public class KuaishouItemListController extends BaseController {
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 导出骄阳商品信息
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("/excelJYOrderItemList")
|
|
|
|
|
+ @ApiOperation(value = "导出骄阳商品信息")
|
|
|
|
|
+ public void export(HttpServletResponse response,
|
|
|
|
|
+ @ApiParam("开始时间") @RequestParam(value = "startDate", required = false) String startDate,
|
|
|
|
|
+ @ApiParam("结束时间") @RequestParam(value = "endDate", required = false) String endDate) {
|
|
|
|
|
+ List<JYOrderItemList> list = kuaishouItemListService.getJYOrderItemList(startDate, endDate);
|
|
|
|
|
+ ExcelUtil<JYOrderItemList> util = new ExcelUtil<JYOrderItemList>(JYOrderItemList.class);
|
|
|
|
|
+ util.exportExcel(response, list, "骄阳商品信息数据");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|