Merge remote-tracking branch 'origin/package' into package

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsPromotionDayController.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.data.serve.controller;
 
-import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.pojo.dto.PromotionDayDTO;
 import com.zanxiang.game.data.serve.pojo.dto.PromotionDayTotalDTO;
 import com.zanxiang.game.data.serve.pojo.vo.PromotionDayTotalVO;
@@ -32,14 +31,14 @@ public class AdsPromotionDayController {
     private IAdsPromotionDayService adsPromotionDayService;
 
     @ApiOperation(value = "广告监控数据")
-    @PreAuthorize(permissionKey = "promotionData:adsPromotionDay:day")
+    //@PreAuthorize(permissionKey = "promotionData:adsPromotionDay:day")
     @PostMapping("/day")
     public ResultVO<Page<PromotionDayVO>> getPromotionDayData(@RequestBody PromotionDayDTO dto){
         return ResultVO.ok(adsPromotionDayService.getPromotionDayData(dto));
     }
 
     @ApiOperation(value = "广告监控数据总计")
-    @PreAuthorize(permissionKey = "promotionData:adsPromotionDay:total")
+    //@PreAuthorize(permissionKey = "promotionData:adsPromotionDay:total")
     @PostMapping("/total")
     public ResultVO<PromotionDayTotalVO> getPromotionDayTotalData(@RequestBody PromotionDayTotalDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getPromotionDayTotalData(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/PromotionDayServiceImpl.java

@@ -538,7 +538,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 	SUM(d2) as d2,
                 	SUM(d3) as d3,
                 	SUM(d7) as d7,
-                	SUM(d15) as d15
+                	SUM(d15) as d15,
+                	SUM(active) as active
                 FROM
                 	game_ads.ads_promotion_day
                 """;
@@ -559,7 +560,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     cpa_bid,
                     roi_goal,
                     budget,
-                    schedule_time,
+                    concat(start_time,'/',end_time) as schedule_time,
                     notes,
                     service,
                     balance,