fix : 对接CP修改

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

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
+import com.zanxiang.game.module.manage.pojo.params.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.params.OrderParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
 import com.zanxiang.game.module.manage.pojo.vo.OrderListVO;
@@ -48,7 +48,7 @@ public class OrderController {
     @PostMapping(value = "/cp/call/list")
     @PreAuthorize(permissionKey = "sdk:order:callCpList")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = LogPayCpVO.class, responseContainer = "list")})
-    public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody LogPayCpParam param) {
+    public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody PayCallCpLogParam param) {
         return ResultVO.ok(logPayCpService.callCpList(param));
     }
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/LogPayCpParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayCallCpLogParam.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -20,7 +20,7 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class LogPayCpParam extends BaseListDTO<LogPayCp> {
+public class PayCallCpLogParam extends BaseListDTO<PayCallCpLog> {
 
     /**
      * 商户订单号

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/ILogPayCpService.java

@@ -2,16 +2,16 @@ package com.zanxiang.game.module.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
+import com.zanxiang.game.module.manage.pojo.params.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 
 /**
  * @author : lingfeng
  * @time : 2022-06-23
  * @description : 通知CP记录表
  */
-public interface ILogPayCpService extends IService<LogPayCp> {
+public interface ILogPayCpService extends IService<PayCallCpLog> {
 
     /**
      * 回调cp列表
@@ -19,5 +19,5 @@ public interface ILogPayCpService extends IService<LogPayCp> {
      * @param param 参数
      * @return {@link IPage}<{@link LogPayCpVO}>
      */
-    IPage<LogPayCpVO> callCpList(LogPayCpParam param);
+    IPage<LogPayCpVO> callCpList(PayCallCpLogParam param);
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/LogPayCpServiceImpl.java

@@ -3,10 +3,10 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
+import com.zanxiang.game.module.manage.pojo.params.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
 import com.zanxiang.game.module.manage.service.ILogPayCpService;
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 import com.zanxiang.game.module.mybatis.mapper.LogPayCpMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import org.springframework.stereotype.Service;
@@ -19,19 +19,19 @@ import java.util.Objects;
  * @description : 通知CP记录表
  */
 @Service
-public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, LogPayCp> implements ILogPayCpService {
+public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, PayCallCpLog> implements ILogPayCpService {
 
     @Override
-    public IPage<LogPayCpVO> callCpList(LogPayCpParam param) {
-        return page(param.toPage(), new LambdaQueryWrapper<LogPayCp>()
-                .eq(LogPayCp::getOrderId, param.getOrderId())).convert(this::toVo);
+    public IPage<LogPayCpVO> callCpList(PayCallCpLogParam param) {
+        return page(param.toPage(), new LambdaQueryWrapper<PayCallCpLog>()
+                .eq(PayCallCpLog::getOrderId, param.getOrderId())).convert(this::toVo);
     }
 
-    private LogPayCpVO toVo(LogPayCp logPayCp) {
-        if (Objects.isNull(logPayCp)) {
+    private LogPayCpVO toVo(PayCallCpLog payCallCpLog) {
+        if (Objects.isNull(payCallCpLog)) {
             return null;
         }
-        return BeanUtil.copy(logPayCp, LogPayCpVO.class);
+        return BeanUtil.copy(payCallCpLog, LogPayCpVO.class);
     }
 
 }

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Cp.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,7 +17,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_cp")
-public class Cp {
+public class Cp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Game.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,7 +17,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game")
-public class Game {
+public class Game implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 游戏ID

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameApplet.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_applet")
-public class GameApplet {
+public class GameApplet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameCategory.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_category")
-public class GameCategory {
+public class GameCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 游戏分类ID

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameExt.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @TableName("t_game_ext")
 public class GameExt implements Serializable {
 
-    private static final long serialVersionUID = 5699964900570462660L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
@@ -54,6 +54,21 @@ public class GameExt implements Serializable {
      */
     private String payKey;
 
+    /**
+     * CP充值回调路径
+     */
+    private String payCallBackUrl;
+
+    /**
+     * 强制实名认证开关
+     */
+    private Boolean checkSwitch;
+
+    /**
+     * 广告回传开关
+     */
+    private Boolean adCallBackSwitch;
+
     /**
      * 客服手机
      */
@@ -79,16 +94,6 @@ public class GameExt implements Serializable {
      */
     private String mpCode;
 
-    /**
-     * CP充值回调路径
-     */
-    private String payCallBackUrl;
-
-    /**
-     * 强制实名认证开关
-     */
-    private Boolean checkSwitch;
-
     /**
      * 创建时间
      */

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GamePayWay.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_pay_way")
-public class GamePayWay {
+public class GamePayWay implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GamePicture.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -18,7 +19,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_picture")
-public class GamePicture {
+public class GamePicture implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameTag.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,7 +17,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_tag")
-public class GameTag {
+public class GameTag implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameUser.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_user")
-public class GameUser {
+public class GameUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameUserRole.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_game_user_role")
-public class GameUserRole {
+public class GameUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/IpBan.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,7 +17,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_ip_ban")
-public class IpBan {
+public class IpBan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/MiPaySum.java

@@ -0,0 +1,116 @@
+package com.zanxiang.game.module.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description : 米大师支付统计
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@TableName("t_mi_pay_sum")
+public class MiPaySum implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 游戏id
+     */
+    private Long gameId;
+
+    /**
+     * 小游戏应用id
+     */
+    private String appId;
+
+    /**
+     * 最大支付额度锁 0 正常 1 锁定
+     */
+    private Integer maxPayLock;
+
+    /**
+     * 最大支付额度
+     */
+    private BigDecimal maxPayAmount;
+
+    /**
+     * 总支付金额
+     */
+    private BigDecimal totalPayAmount;
+
+    /**
+     * 月已用支付额度
+     */
+    private BigDecimal mouthPayAmount;
+
+    /**
+     * 月更新日期
+     */
+    private LocalDateTime mouthUpdateDate;
+
+    /**
+     * 周已用额度
+     */
+    private BigDecimal weakerPayAmount;
+
+    /**
+     * 周更新日期
+     */
+    private LocalDateTime weakerUpdateDate;
+
+    /**
+     * 日已用额度
+     */
+    private BigDecimal dayPayAmount;
+
+    /**
+     * 日更新日期
+     */
+    private LocalDateTime dayUpdateDate;
+
+    /**
+     * 状态 1 不可用 0 正常
+     */
+    private Integer status;
+
+    /**
+     * 1 删除  0 正常
+     */
+    @TableLogic
+    private Integer isDelete;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 支付方式id列表
+     */
+    private String payDeviceIds;
+}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Order.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -20,7 +21,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_order")
-public class Order {
+public class Order implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 自增ID

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/OrderPayParam.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -20,7 +21,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_order_pay_param")
-public class OrderPayParam {
+public class OrderPayParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/LogPayCp.java → game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PayCallCpLog.java

@@ -21,8 +21,8 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@TableName("t_log_pay_cp")
-public class LogPayCp implements Serializable {
+@TableName("t_pay_call_cp_log")
+public class PayCallCpLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PayDevice.java

@@ -9,6 +9,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -21,7 +22,9 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 @TableName("t_pay_device")
-public class PayDevice {
+public class PayDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PayWay.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_pay_way")
-public class PayWay {
+public class PayWay implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 支付方式

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/User.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import org.apache.logging.log4j.util.Strings;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -20,7 +21,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_user")
-public class User {
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/UserAddress.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_user_address")
-public class UserAddress {
+public class UserAddress implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/UserBan.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_user_ban")
-public class UserBan {
+public class UserBan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/UserCard.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import org.apache.logging.log4j.util.Strings;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -19,7 +20,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_user_card")
-public class UserCard {
+public class UserCard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/UserLoginLog.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -18,7 +19,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_user_login_log")
-public class UserLoginLog {
+public class UserLoginLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/UserShare.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -18,7 +19,9 @@ import java.time.LocalDateTime;
 @ToString
 @Builder
 @TableName("t_user_share")
-public class UserShare {
+public class UserShare implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/UserToken.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @TableName("t_user_token")
 public class UserToken implements Serializable {
 
-    private static final long serialVersionUID = -6515396685604515968L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * id

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/WordCheck.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import java.io.Serializable;
+
 /**
  * @author : lingfeng
  * @time : 2022-06-14
@@ -18,7 +20,9 @@ import lombok.ToString;
 @AllArgsConstructor
 @ToString
 @TableName("t_word_check")
-public class WordCheck {
+public class WordCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/IMiPaySumMapper.java

@@ -0,0 +1,12 @@
+package com.zanxiang.game.module.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.module.mybatis.entity.MiPaySum;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description : 米大师支付统计
+ */
+public interface IMiPaySumMapper extends BaseMapper<MiPaySum> {
+}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/LogPayCpMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2022-06-27 14:07
  */
 @Mapper
-public interface LogPayCpMapper extends BaseMapper<LogPayCp> {
+public interface LogPayCpMapper extends BaseMapper<PayCallCpLog> {
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/ILogPayCpService.java

@@ -1,11 +1,11 @@
 package com.zanxiang.game.module.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 
 /**
  * @author xufeng
  * @date 2022/6/28 10:35
  */
-public interface ILogPayCpService extends IService<LogPayCp> {
+public interface ILogPayCpService extends IService<PayCallCpLog> {
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/CallBackServiceImpl.java

@@ -11,10 +11,7 @@ import com.zanxiang.game.back.base.tencent.pojo.dto.TencentOrderDTO;
 import com.zanxiang.game.back.base.tencent.pojo.dto.TencentUserDTO;
 import com.zanxiang.game.back.base.tencent.rpc.IGameBackTencentRpc;
 import com.zanxiang.game.module.base.pojo.enums.GameCategoryEnum;
-import com.zanxiang.game.module.mybatis.entity.Agent;
-import com.zanxiang.game.module.mybatis.entity.Game;
-import com.zanxiang.game.module.mybatis.entity.GameApplet;
-import com.zanxiang.game.module.mybatis.entity.User;
+import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.sdk.pojo.dto.PlatformOrderDTO;
 import com.zanxiang.game.module.sdk.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -53,8 +50,16 @@ public class CallBackServiceImpl implements ICallBackService {
     @Autowired
     private IUserService userService;
 
+    @Autowired
+    private IGameExtService gameExtService;
+
     @Override
     public void userCallBack(User user, Tuple2<Long, Map<String, String>> tuple2) {
+        //判断游戏是否开启广告回传, 未开启, 不回传
+        GameExt gameExt = gameExtService.getByGameId(user.getGameId());
+        if (!Objects.equals(gameExt.getAdCallBackSwitch(), Boolean.TRUE)) {
+            return;
+        }
         Long agentId = tuple2.getT1();
         Map<String, String> urlParamMap = tuple2.getT2();
         //自然量, 或者跳转链接参数不存在, 不做回传处理
@@ -92,6 +97,11 @@ public class CallBackServiceImpl implements ICallBackService {
 
     @Override
     public void orderCallBack(PlatformOrderDTO platformOrderDTO) {
+        //判断游戏是否开启广告回传, 未开启, 不回传
+        GameExt gameExt = gameExtService.getByGameId(platformOrderDTO.getGameId());
+        if (!Objects.equals(gameExt.getAdCallBackSwitch(), Boolean.TRUE)) {
+            return;
+        }
         //查询用户渠道信息
         Agent agent = agentService.getById(platformOrderDTO.getAgentId());
         if (agent == null) {

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameExtServiceImpl.java

@@ -27,30 +27,29 @@ public class GameExtServiceImpl extends ServiceImpl<GameExtMapper, GameExt> impl
     @Override
     public GameExt getByGameId(Long gameId) {
         //查询缓存
-//        GameExt gameKey = redisUtil.getCache(this.getGameKey(String.valueOf(gameId)));
-
-
-        GameExt gameKey = this.getOne(new LambdaQueryWrapper<GameExt>().eq(GameExt::getGameId, gameId));
-//        if (gameKey == null) {
-//            gameKey = this.getOne(new LambdaQueryWrapper<GameExt>().eq(GameExt::getGameId, gameId));
-//        }
-        if (gameKey != null) {
-            redisUtil.setCache(this.getGameKey(String.valueOf(gameId)), gameKey, ExpireTimeEnum.ONE_DAY.getTime());
+        GameExt gameExt = redisUtil.getCache(this.getGameKey(String.valueOf(gameId)));
+        if (gameExt != null) {
+            return gameExt;
+        }
+        gameExt = this.getOne(new LambdaQueryWrapper<GameExt>().eq(GameExt::getGameId, gameId));
+        if (gameExt != null) {
+            redisUtil.setCache(this.getGameKey(String.valueOf(gameId)), gameExt, ExpireTimeEnum.ONE_DAY.getTime());
         }
-        return gameKey;
+        return gameExt;
     }
 
     @Override
     public GameExt getByGameAppId(String appId) {
         //查询缓存
-        GameExt gameKey = redisUtil.getCache(this.getGameKey(appId));
-        if (gameKey == null) {
-            gameKey = this.getOne(new LambdaQueryWrapper<GameExt>().eq(GameExt::getAppId, appId));
+        GameExt gameExt = redisUtil.getCache(this.getGameKey(appId));
+        if (gameExt != null) {
+            return gameExt;
         }
-        if (gameKey != null) {
-            redisUtil.setCache(this.getGameKey(appId), gameKey, ExpireTimeEnum.ONE_DAY.getTime());
+        gameExt = this.getOne(new LambdaQueryWrapper<GameExt>().eq(GameExt::getAppId, appId));
+        if (gameExt != null) {
+            redisUtil.setCache(this.getGameKey(appId), gameExt, ExpireTimeEnum.ONE_DAY.getTime());
         }
-        return gameKey;
+        return gameExt;
     }
 
     private String getGameKey(String key) {

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LogPayCpServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 import com.zanxiang.game.module.mybatis.mapper.LogPayCpMapper;
 import com.zanxiang.game.module.sdk.service.ILogPayCpService;
 import lombok.extern.slf4j.Slf4j;
@@ -15,5 +15,5 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, LogPayCp> implements ILogPayCpService {
+public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, PayCallCpLog> implements ILogPayCpService {
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PerformOrderServiceImpl.java

@@ -103,7 +103,7 @@ public class PerformOrderServiceImpl implements IPerformOrderService {
                 .eq(Order::getOrderId, orderInfo.getOrderId())
         );
         //更新回调记录
-        logPayCpService.save(LogPayCp.builder()
+        logPayCpService.save(PayCallCpLog.builder()
                 .orderId(orderInfo.getOrderId())
                 .cpOrderId(orderInfo.getCpOrderId())
                 .status(orderInfo.getStatus())