订单更新

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsOrderDetail.java

@@ -88,18 +88,36 @@ public class AdsOrderDetail implements Serializable {
     @Column
     private String agentId;
 
+    /**
+     * 注册渠道名称
+     */
+    @Column
+    private String agentName;
+
     /**
      * 父游戏ID
      */
     @Column
     private String parentId;
 
+    /**
+     * 父游戏名称
+     */
+    @Column
+    private String parentGameName;
+
     /**
      * 注册游戏ID
      */
     @Column
     private String gameId;
 
+    /**
+     * 注册游戏名称
+     */
+    @Column
+    private String gameName;
+
     /**
      * 注册游戏类别,3开头为android 4 开头为IOS 5 开头为H5 6开头为小程序 对应于game_class中的ID
      */
@@ -142,12 +160,24 @@ public class AdsOrderDetail implements Serializable {
     @Column
     private String orderAgentId;
 
+    /**
+     * 充值渠道名称
+     */
+    @Column
+    private String orderAgentName;
+
     /**
      * 充值游戏ID
      */
     @Column
     private String orderGameId;
 
+    /**
+     * 充值游戏名称
+     */
+    @Column
+    private String orderGameName;
+
     /**
      * 充值游戏类型
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/AdsAgentRechargeRankingVO.java

@@ -39,7 +39,7 @@ public class AdsAgentRechargeRankingVO {
     private Long totalRechargeCount;
 
     @ApiModelProperty(notes = "累计消耗")
-    private Long totalCost;
+    private BigDecimal totalCost;
 
     @ApiModelProperty(notes = "平均单价")
     private BigDecimal avgAmount;

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/AdsOrderDetailVO.java

@@ -40,12 +40,21 @@ public class AdsOrderDetailVO {
     @ApiModelProperty(notes = "注册渠道ID")
     private String agentId;
 
+    @ApiModelProperty(notes = "注册渠道名称")
+    private String agentName;
+
     @ApiModelProperty(notes = "父游戏ID")
     private String parentId;
 
+    @ApiModelProperty(notes = "父游戏名称")
+    private String parentGameName;
+
     @ApiModelProperty(notes = "注册游戏ID")
     private String gameId;
 
+    @ApiModelProperty(notes = "gameName")
+    private String gameName;
+
     @ApiModelProperty(notes = "注册游戏类别,3开头为android 4 开头为IOS 5 开头为H5 6开头为小程序 对应于game_class中的ID")
     private String classify;
 
@@ -67,9 +76,15 @@ public class AdsOrderDetailVO {
     @ApiModelProperty(notes = "充值渠道ID")
     private String orderAgentId;
 
+    @ApiModelProperty(notes = "充值渠道名称")
+    private String orderAgentName;
+
     @ApiModelProperty(notes = "充值游戏ID")
     private String orderGameId;
 
+    @ApiModelProperty(notes = "充值游戏名称")
+    private String orderGameName;
+
     @ApiModelProperty(notes = "充值游戏类型")
     private String orderGameClassify;
 

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

@@ -33,7 +33,7 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
             dto.setZxPitcherId(SecurityUtil.getUserId().toString());
         }
         Pager pager = dto.toPage();
-        Cnd cnd = Cnd.where(Exps.isNull(AdsOrderDetail::getZxPitcherId).setNot(true));
+        Cnd cnd = Cnd.where("1", "=", "1");
         if (dto.getBeginOrderTime() != null) {
             cnd.and(AdsOrderDetail::getOrderCreateTime, ">=", dto.getBeginOrderTime());
         }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/AgentController.java

@@ -65,8 +65,8 @@ public class AgentController {
     }
 
     @PreAuthorize(permissionKey = "manage:agent:configBackPolicy")
-    @PutMapping("/configBackPolicy/{agentIds}/{backPolicyId}")
-    public ResultVO<Boolean> configBackPolicy(@PathVariable("agentIds") List<Long> agentIds, @PathVariable("backPolicyId") Long backPolicyId) {
+    @PutMapping({"/configBackPolicy/{agentIds}/{backPolicyId}", "/configBackPolicy/{agentIds}"})
+    public ResultVO<Boolean> configBackPolicy(@PathVariable("agentIds") List<Long> agentIds, @PathVariable(value = "backPolicyId", required = false) Long backPolicyId) {
         return ResultVO.ok(agentService.configBackPolicy(agentIds, backPolicyId));
     }
 }