Просмотр исходного кода

操作记录-消耗对应的操作记录修改

yangzian 2 лет назад
Родитель
Сommit
5e93f3f1b5

+ 10 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/KuaiShouOperationRecordController.java

@@ -88,13 +88,22 @@ public class KuaiShouOperationRecordController {
 
 
 
+    /**
+     *
+     * @description: 快手操作记录
+     *
+     * @param advertiserId
+     * @param unitId
+     * @param startTime
+     * @param endTime
+     * @return: org.jeecg.common.api.vo.Result<com.alibaba.fastjson.JSONObject>
+     */
     @GetMapping("/getKuaishouOperationRecordByUnit")
     public Result<JSONObject> getKuaishouOperationRecordByUnit(@RequestParam(name="advertiserId") long advertiserId,
                                                                     @RequestParam(name="unitId") long unitId,
                                                                      @RequestParam(name="startTime") String startTime,
                                                                      @RequestParam(name="endTime") String endTime) throws Exception{
 
-
         return kuaishouOperationRecordService.getKuaishouOperationRecordByUnit(advertiserId,unitId,startTime,endTime);
     }
 

+ 11 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/KuaishouOperationRecordMapper.java

@@ -48,7 +48,17 @@ public interface KuaishouOperationRecordMapper {
      * @param endTime
      * @return
      */
-    List<JSONObject> getKuaishouOperationRecordByAdvertiserId(@Param("advertiserId") long advertiserId,@Param("objectId") long objectId,@Param("operationType") int operationType,  @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<JSONObject> getKuaishouOperationRecordByAdvertiserId(@Param("advertiserId") long advertiserId,@Param("objectId") long objectId,@Param("operationType") int operationType,  @Param("operationTime") String operationTime);
+
+    /**
+     * 查看快手 组数据信息
+     * @param accountId
+     * @param unitId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<JSONObject> getKuaishouOperationUnitReport(@Param("accountId") long accountId,@Param("unitId") long unitId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
 
 }

+ 33 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/KuaishouOperationRecordMapper.xml

@@ -106,6 +106,38 @@
     </select>
 
 
+    <!-- 查看快手 组数据信息  -->
+    <select id="getKuaishouOperationUnitReport" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        unit_id AS unitId,
+        stat_date AS statDate,
+        HOUR AS statHour,
+        charge,
+        activation,
+        ROUND( charge / activation * 100, 2 ) AS activeCost,
+        event_register AS eventRegister,
+        event_register_cost AS eventRegisterCost,
+        event_next_day_stay AS eventNextDayStay,
+        event_next_day_stay_cost AS eventNextDayStay,
+        event_pay_first_day AS eventPayIfrstDay,
+        ROUND( charge / event_pay_first_day * 100, 2 ) AS eventPayIfrstDayCost,
+        form_count AS formCount
+        FROM
+        application.kuaishou_unit_report_hourly_dw
+        WHERE
+        stat_date &gt;= date_format(#{startTime}, '%Y%m%d')
+        AND stat_date &lt;= date_format(#{endTime}, '%Y%m%d')
+        AND account_id = #{accountId}
+        AND unit_id = #{unitId}
+        ORDER BY
+        stat_date,HOUR
+
+
+    </select>
+
+
+
+
     <!-- 查看账户操作记录 -->
     <select id="getKuaishouOperationRecordByAdvertiserId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
@@ -124,8 +156,7 @@
             advertiser_id = #{advertiserId}
             AND operation_type = #{operationType}
             AND object_id = #{objectId}
-            AND operation_time &gt;= #{startTime}
-            AND operation_time &lt;= #{endTime}
+          AND date_format(operation_time, '%Y%m%d%H') = #{operationTime}
 
 
     </select>

+ 10 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/KuaishouOperationRecordServiceImpl.java

@@ -130,10 +130,16 @@ public class KuaishouOperationRecordServiceImpl implements KuaishouOperationReco
      */
     @Override
     public Result getKuaishouOperationRecordByUnit(long advertiserId,long unitId,String startTime,String endTime){
-
-        List<JSONObject> list =  kuaishouOperationRecordMapper.getKuaishouOperationRecordByAdvertiserId(advertiserId,unitId,2,startTime+" 00:00:00",endTime+" 23:59:59");
-
-        return Result.successMsg("查询成功",list);
+        //查询时报数据
+        List<JSONObject> unitList =  kuaishouOperationRecordMapper.getKuaishouOperationUnitReport(advertiserId,unitId,startTime,endTime);
+        for (JSONObject unit : unitList) {
+            long uId = Long.valueOf(unit.getString("unitId"));
+            String operationTime = unit.getString("statDate") + String.format("%0" + 2 + "d", unit.getInteger("statHour"));
+            //查询操作记录
+            List<JSONObject> list =  kuaishouOperationRecordMapper.getKuaishouOperationRecordByAdvertiserId(advertiserId,uId,2,operationTime);
+            unit.put("operationList",list);
+        }
+        return Result.successMsg("查询成功",unitList);
     }