yumeng 1 年之前
父节点
当前提交
7586bdbfc5

+ 23 - 5
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -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);
     }
 

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/mapper/JiaoYangReportMapper.java

@@ -50,4 +50,6 @@ public interface JiaoYangReportMapper {
     List<JSONObject> getTopItem(@Param("date") Long date, @Param("promoterId") Long promoterId, @Param("fieId") String fieId, @Param("sort") String sort);
 
     List<JSONObject> getTopItemUser();
+
+    List<JSONObject> getDataByDate(@Param("date") Long date);
 }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/IJiaoYangReportService.java

@@ -49,4 +49,6 @@ public interface IJiaoYangReportService {
     List<JSONObject> getTopItem(Long date, Long promoterId,String  fieId,String sort);
 
     List<JSONObject> getTopItemUser();
+
+    List<JSONObject> getDataByDate(Long strDateTimsToInt);
 }

+ 5 - 0
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/impl/JiaoYangReportServiceImpl.java

@@ -123,4 +123,9 @@ public class JiaoYangReportServiceImpl implements IJiaoYangReportService {
     public List<JSONObject> getTopItemUser() {
         return jiaoYangReportMapper.getTopItemUser();
     }
+
+    @Override
+    public List<JSONObject> getDataByDate(Long strDateTimsToInt) {
+        return jiaoYangReportMapper.getDataByDate(strDateTimsToInt);
+    }
 }

+ 8 - 0
ruixuan-live/src/main/resources/mapper/jiaoyang/JiaoYangReportMapper.xml

@@ -729,6 +729,14 @@ from (select date_format(#{date},'%Y/%m/%d')
     <select id="getTopItemUser" resultType="com.alibaba.fastjson.JSONObject">
         select id,name  from jy_fx_top_item_config
     </select>
+    <select id="getDataByDate" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
+        select stat_hour as 'time', round(sum(order_amount) / 100, 2) as 'charge'
+from jy_order_list
+where stat_date = #{date}
+group by stat_hour
+order by stat_hour
+
+    </select>
 
 
 </mapper>