|
@@ -49,6 +49,25 @@ public class JiaoYangReportController extends BaseController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/getHourGmv")
|
|
|
+ @ApiOperation(value = "商品列表")
|
|
|
+ public JSONObject getHourGmv() throws ParseException {
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
+ String nowDate = DateUtils.getNowDate("yyyy-MM-dd"); // 当天
|
|
|
+ String lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 日期 -1
|
|
|
+ List<JSONObject> today = jiaoYangReportService.getDataByDate(DateUtils.strDateTimsToInt(nowDate));
|
|
|
+ List<JSONObject> yesterday = jiaoYangReportService.getDataByDate(DateUtils.strDateTimsToInt(lastDate));
|
|
|
+ JSONObject result = new JSONObject();
|
|
|
+ result.put("today", today);
|
|
|
+ result.put("yesterday", yesterday);
|
|
|
+ returnJson.put("result", result);
|
|
|
+ returnJson.put("success", true);
|
|
|
+ returnJson.put("message", "操作成功");
|
|
|
+ returnJson.put("code", 200);
|
|
|
+
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/profitData")
|
|
|
@ApiOperation(value = "商品列表")
|
|
|
public JSONObject profitData(String date) throws ParseException {
|
|
@@ -261,7 +280,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
|
|
|
- String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
+ /* String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
|
|
@@ -275,7 +294,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
return getDataTable(new ArrayList<JSONObject>());
|
|
|
}
|
|
|
requestMap.put("promoterIds", promoterIds);
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
@@ -468,12 +487,11 @@ public class JiaoYangReportController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@GetMapping("/getTopItem")
|
|
|
- public TableDataInfo getTopItem(String statDate, Long promoterId,String fieId,String sort) {
|
|
|
+ public TableDataInfo getTopItem(String statDate, Long promoterId, String fieId, String sort) {
|
|
|
Long date = Long.valueOf(statDate.replace("-", ""));
|
|
|
startPage();
|
|
|
- List<JSONObject> list = jiaoYangReportService.getTopItem(date, promoterId,fieId,sort);
|
|
|
+ List<JSONObject> list = jiaoYangReportService.getTopItem(date, promoterId, fieId, sort);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|