fix : 新增米大师收款统计表

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

@@ -14,12 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

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

@@ -2,8 +2,8 @@ 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.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.params.OrderParam;
+import com.zanxiang.game.module.manage.pojo.params.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
 import com.zanxiang.game.module.manage.pojo.vo.OrderListVO;
 import com.zanxiang.game.module.manage.service.ILogPayCpService;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/AgentListParam.java

@@ -5,7 +5,6 @@ import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 
 /**

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

@@ -3,8 +3,11 @@ 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.dto.GameDTO;
-import com.zanxiang.game.module.manage.pojo.params.*;
-import com.zanxiang.game.module.manage.pojo.vo.*;
+import com.zanxiang.game.module.manage.pojo.params.GameAddParam;
+import com.zanxiang.game.module.manage.pojo.params.GameListParam;
+import com.zanxiang.game.module.manage.pojo.vo.GameChoiceVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameListVO;
 import com.zanxiang.game.module.mybatis.entity.Game;
 
 import java.util.Collection;

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

@@ -0,0 +1,12 @@
+package com.zanxiang.game.module.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.game.module.mybatis.entity.MiPaySum;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description :
+ */
+public interface IMiPaySumService extends IService<MiPaySum> {
+}

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

@@ -7,7 +7,7 @@ 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.PayCallCpLog;
-import com.zanxiang.game.module.mybatis.mapper.LogPayCpMapper;
+import com.zanxiang.game.module.mybatis.mapper.PayCallCpMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +19,7 @@ import java.util.Objects;
  * @description : 通知CP记录表
  */
 @Service
-public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, PayCallCpLog> implements ILogPayCpService {
+public class LogPayCpServiceImpl extends ServiceImpl<PayCallCpMapper, PayCallCpLog> implements ILogPayCpService {
 
     @Override
     public IPage<LogPayCpVO> callCpList(PayCallCpLogParam param) {

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

@@ -0,0 +1,18 @@
+package com.zanxiang.game.module.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.module.manage.service.IMiPaySumService;
+import com.zanxiang.game.module.mybatis.entity.MiPaySum;
+import com.zanxiang.game.module.mybatis.mapper.MiPaySumMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description : 米大师支付统计
+ */
+@Slf4j
+@Service
+public class MiPaySumServiceImpl extends ServiceImpl<MiPaySumMapper, MiPaySum> implements IMiPaySumService {
+}

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

@@ -8,5 +8,5 @@ import com.zanxiang.game.module.mybatis.entity.MiPaySum;
  * @time : 2023-06-21
  * @description : 米大师支付统计
  */
-public interface IMiPaySumMapper extends BaseMapper<MiPaySum> {
+public interface MiPaySumMapper extends BaseMapper<MiPaySum> {
 }

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

@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2022-06-27 14:07
  */
 @Mapper
-public interface LogPayCpMapper extends BaseMapper<PayCallCpLog> {
+public interface PayCallCpMapper extends BaseMapper<PayCallCpLog> {
 }

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

@@ -1,11 +1,14 @@
 package com.zanxiang.game.module.sdk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.game.module.mybatis.entity.IpBan;
+
 /**
  * @author : lingfeng
  * @time : 2022-06-28
  * @description : ip封禁管理
  */
-public interface IIpBanService {
+public interface IIpBanService extends IService<IpBan> {
 
     /**
      * 检查ip禁令

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

@@ -0,0 +1,12 @@
+package com.zanxiang.game.module.sdk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.game.module.mybatis.entity.MiPaySum;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description :
+ */
+public interface IMiPaySumService extends IService<MiPaySum> {
+}

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

@@ -7,5 +7,5 @@ import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
  * @author xufeng
  * @date 2022/6/28 10:35
  */
-public interface ILogPayCpService extends IService<PayCallCpLog> {
+public interface IPayCallCpService extends IService<PayCallCpLog> {
 }

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

@@ -0,0 +1,18 @@
+package com.zanxiang.game.module.sdk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.module.mybatis.entity.MiPaySum;
+import com.zanxiang.game.module.mybatis.mapper.MiPaySumMapper;
+import com.zanxiang.game.module.sdk.service.IMiPaySumService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description : 米大师支付统计
+ */
+@Slf4j
+@Service
+public class MiPaySumServiceImpl extends ServiceImpl<MiPaySumMapper, MiPaySum> implements IMiPaySumService {
+}

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

@@ -2,8 +2,8 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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 com.zanxiang.game.module.mybatis.mapper.PayCallCpMapper;
+import com.zanxiang.game.module.sdk.service.IPayCallCpService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -15,5 +15,5 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, PayCallCpLog> implements ILogPayCpService {
+public class PayCallCpServiceImpl extends ServiceImpl<PayCallCpMapper, PayCallCpLog> implements IPayCallCpService {
 }

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

@@ -42,7 +42,7 @@ public class PerformOrderServiceImpl implements IPerformOrderService {
     private IOrderService orderService;
 
     @Autowired
-    private ILogPayCpService logPayCpService;
+    private IPayCallCpService payCallCpService;
 
     @Autowired
     private IGameUserRoleService gameUserRoleService;
@@ -103,7 +103,7 @@ public class PerformOrderServiceImpl implements IPerformOrderService {
                 .eq(Order::getOrderId, orderInfo.getOrderId())
         );
         //更新回调记录
-        logPayCpService.save(PayCallCpLog.builder()
+        payCallCpService.save(PayCallCpLog.builder()
                 .orderId(orderInfo.getOrderId())
                 .cpOrderId(orderInfo.getCpOrderId())
                 .status(orderInfo.getStatus())