Sfoglia il codice sorgente

两个抖音排行榜 当日涨跌幅也改成环比昨天同时段的

zhaoxian 1 anno fa
parent
commit
808e8626fb

+ 6 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -761,6 +761,7 @@ public class SupplyChainController extends BaseController {
     private TableDataInfo indexOrderRankBytedance(Integer dateType, String orderStartDate, String orderEndDate) {
         Map<String, Object> requestMap = new HashMap<>();
         if (dateType == 0) {
+            Integer hour = DateUtils.getNowHour(); // 当前小时
             Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate);
             String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
             Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日时间
@@ -768,6 +769,8 @@ public class SupplyChainController extends BaseController {
             requestMap.put("nowEndHourTemp", nowStartHourTemp);
             requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
             requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
+            requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
+            requestMap.put("hour", hour);
             startPage();
             List<JSONObject> orderRankRatioList = supplyChainService.getOrderRankRatioListBytedance(requestMap);
             return getDataTable(orderRankRatioList);
@@ -859,6 +862,7 @@ public class SupplyChainController extends BaseController {
                 }
                 requestMap.put("promoterIds", promoterIds);
             }
+            Integer hour = DateUtils.getNowHour(); // 当前小时
             Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate); // 当天开始时间戳
             String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
             Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日开始时间戳
@@ -866,6 +870,8 @@ public class SupplyChainController extends BaseController {
             requestMap.put("nowEndHourTemp", nowStartHourTemp);
             requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
             requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
+            requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
+            requestMap.put("hour", hour);
             startPage();
             List<JSONObject> promoterRankRatioList = supplyChainService.getPromoterRankRatioListBytedance(requestMap);
             return getDataTable(promoterRankRatioList);

+ 12 - 0
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -546,6 +546,9 @@
         <if test="nowEndHourTemp != null and nowEndHourTemp != ''">
             and pay_success_time &lt;= #{nowEndHourTemp}
         </if>
+        <if test="hour != null and hour != ''">
+            and pay_success_time_hour &lt;= #{hour}
+        </if>
         group by product_id
         ) t1
         left join (select
@@ -559,6 +562,9 @@
         <if test="yesterdayEndHourTemp != null and yesterdayEndHourTemp != ''">
             and pay_success_time &lt;= #{yesterdayEndHourTemp}
         </if>
+        <if test="hour != null and hour != ''">
+            and pay_success_time_hour &lt;= #{hour}
+        </if>
         group by product_id
         ) t2 on t1.itemId = t2.itemId
         order by t1.orderNum desc
@@ -689,6 +695,9 @@
         <if test="nowEndHourTemp != null and nowEndHourTemp != ''">
             and pay_success_time &lt;= #{nowEndHourTemp}
         </if>
+        <if test="hour != null and hour != ''">
+            and pay_success_time_hour &lt;= #{hour}
+        </if>
         group by author_short_id
         ) t1
         left join (
@@ -710,6 +719,9 @@
         <if test="yesterdayEndHourTemp != null and yesterdayEndHourTemp != ''">
             and pay_success_time &lt;= #{yesterdayEndHourTemp}
         </if>
+        <if test="hour != null and hour != ''">
+            and pay_success_time_hour &lt;= #{hour}
+        </if>
         group by author_short_id
         ) t2 on t1.promoterId = t2.promoterId
         order by t1.orderNum desc