feat : 接口对接修改

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

@@ -19,14 +19,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * 游戏支付配置表 前端控制器
- *
- * @author xufeng
- * @date 2022-06-30 14:22
+ * @author : lingfeng
+ * @time : 2022-11-25
+ * @description : 游戏支付配置管理
  */
 @Api(tags = "游戏支付配置管理")
 @RestController
-@RequestMapping("/game-pay-way")
+@RequestMapping("/game/pay/way")
 public class GamePayWayController {
 
     @Autowired

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

@@ -19,14 +19,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 游戏策略 前端控制器
- *
- * @author xufeng
- * @date 2022-07-01 11:38
+ * @author : lingfeng
+ * @time : 2022-11-25
+ * @description : 支付策略管理
  */
 @Api(tags = "支付策略管理")
 @RestController
-@RequestMapping("/game-strategy")
+@RequestMapping("/game/pay/strategy")
 public class GameStrategyController {
 
     @Autowired

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

@@ -19,14 +19,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 支付盒子
- *
- * @author xufeng
- * @date 2022-06-22 15:26
+ * @author : lingfeng
+ * @time : 2022-11-25
+ * @description : 支付盒子管理
  */
 @Api(tags = "支付盒子管理")
 @RestController
-@RequestMapping("/pay-box")
+@RequestMapping("/pay/box")
 public class PayBoxController {
 
     @Autowired

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

@@ -1,41 +0,0 @@
-package com.zanxiang.manage.controller;
-
-import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.manage.domain.vo.PayWayVO;
-import com.zanxiang.manage.service.IPayWayService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 支付方式管理
- *
- * @author xufeng
- * @date 2022-06-17 16:05
- */
-@Api(tags = "支付方式管理")
-@RestController
-@RequestMapping("/pay-way")
-public class PayWayController {
-
-    @Autowired
-    private IPayWayService payWayService;
-
-    @ApiOperation(value = "支付方式列表")
-    @GetMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:payWay:list")
-    public ResultVO<List<PayWayVO>> list() {
-//        List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>().eq(PayWay::getParentId, 0));
-//        if (list.isEmpty()) {
-//            return new ResultVO<>(HttpStatusEnum.SUCCESS);
-//        }
-//        return new ResultVO<>(HttpStatusEnum.SUCCESS, BeanUtils.copyList(list, PayWayVO.class));
-        return null;
-    }
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayApplicationBO.java

@@ -1,95 +0,0 @@
-package com.zanxiang.manage.domain.bo;
-
-import com.zanxiang.common.base.BasePage;
-import com.zanxiang.mybatis.entity.PayApplication;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 注释游戏应用表
- *
- * @author xufeng
- * @date 2022-06-20 15:16
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PayApplicationBO extends BasePage<PayApplication> implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    /**
-     * 应用名称
-     */
-    private String name;
-
-    /**
-     * 应用AppSecret
-     */
-    private String appSecret;
-
-    private String version;
-
-    private String appDesc;
-
-    private String appUrl;
-
-    private String appLogo;
-
-    private String miniCode;
-
-    /**
-     * 类型 1 微信小程序
-     */
-    private Integer type;
-
-    /**
-     * 应用appid
-     */
-    private String appId;
-
-    /**
-     * 应用原始id
-     */
-    private String primevalId;
-
-    /**
-     * 应用主体
-     */
-    private String company;
-
-    /**
-     * 登录账号
-     */
-    private String loginName;
-
-    /**
-     * 登录密码
-     */
-    private String loginPassword;
-
-    /**
-     * 管理员
-     */
-    private String managePerson;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态 1 不可用 2 可用
-     */
-    private Integer status;
-
-    /**
-     * 是否已删除 1 已删除 2 正常
-     */
-    private Integer isDelete;
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayBoxBO.java

@@ -1,50 +0,0 @@
-package com.zanxiang.manage.domain.bo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author xufeng
- * @date 2022/6/22 16:53
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PayBoxBO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 支付名称
-     */
-    private String payName;
-
-    /**
-     * 应用id
-     */
-    private Integer payApplicationId;
-
-    /**
-     * 商户号id（多个逗号分割,id,）
-     */
-    private String payMerchantId;
-
-    /**
-     * 盒子类型 1、金币 2、红包
-     */
-    private Integer type;
-
-    /**
-     * 描述
-     */
-    private String desc;
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayMerchantBO.java

@@ -1,127 +0,0 @@
-package com.zanxiang.manage.domain.bo;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xufeng
- * @date 2022/6/16 19:14
- */
-@Data
-@NoArgsConstructor
-public class PayMerchantBO {
-
-    private Long id;
-
-    /**
-     * 支付方式id
-     */
-    private Integer payWayId;
-
-    /**
-     * 商户号
-     */
-    private String merchantNo;
-
-    /**
-     * 商户名称
-     */
-    private String merchantName;
-
-    /**
-     * 支持支付方式（pc/h5/app/）
-     */
-    private String payDevice;
-
-    /**
-     * 商户号登录账号
-     */
-    private String loginName;
-
-    /**
-     * 商户号登录密码
-     */
-    private String loginPassword;
-
-    /**
-     * 管理员
-     */
-    private String managePerson;
-
-    /**
-     * 绑定手机号
-     */
-    private String mobile;
-
-    /**
-     * 绑定邮箱
-     */
-    private String email;
-
-    /**
-     * 状态 1 不可用 2 可用
-     */
-    private Integer status;
-
-    /**
-     * 支付配置json (存储根据payway设置后，配置的具体商户号信息)
-     */
-    private String payConfig;
-
-    /**
-     * 最大支付额度锁 0 正常 1 锁定
-     */
-    private Integer maxPayLock;
-
-    /**
-     * 最大支付额度
-     */
-    private BigDecimal maxPayAmount;
-
-    /**
-     * 月已用支付额度
-     */
-    private BigDecimal mouthPayAmount;
-
-    /**
-     * 月更新日期
-     */
-    private Date mouthUpdateDate;
-
-    /**
-     * 周已用额度
-     */
-    private BigDecimal weakerPayAmount;
-
-    /**
-     * 周更新日期
-     */
-    private Date weakerUpdateDate;
-
-    /**
-     * 日已用额度
-     */
-    private BigDecimal dayPayAmount;
-
-    /**
-     * 日更新日期
-     */
-    private Date dayUpdateDate;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 是否已删除 1 已删除 2 正常
-     */
-    private Integer isDelete;
-    /**
-     * 删除时间
-     */
-    private Date deleteTime;
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayMerchantListBO.java

@@ -1,128 +0,0 @@
-package com.zanxiang.manage.domain.bo;
-
-import com.zanxiang.common.base.BasePage;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xufeng
- * @date 2022/6/16 19:14
- */
-@Data
-@NoArgsConstructor
-public class PayMerchantListBO extends BasePage<PayMerchantListBO> {
-
-    private Long id;
-
-    /**
-     * 支付方式id
-     */
-    private Integer payWayId;
-
-    /**
-     * 商户号
-     */
-    private String merchantNo;
-
-    /**
-     * 商户名称
-     */
-    private String merchantName;
-
-    /**
-     * 支持支付方式（pc/h5/app/）
-     */
-    private String payDevice;
-
-    /**
-     * 商户号登录账号
-     */
-    private String loginName;
-
-    /**
-     * 商户号登录密码
-     */
-    private String loginPassword;
-
-    /**
-     * 管理员
-     */
-    private String managePerson;
-
-    /**
-     * 绑定手机号
-     */
-    private String mobile;
-
-    /**
-     * 绑定邮箱
-     */
-    private String email;
-
-    /**
-     * 状态 1 不可用 2 可用
-     */
-    private Integer status;
-
-    /**
-     * 支付配置json (存储根据payway设置后，配置的具体商户号信息)
-     */
-    private String payConfig;
-
-    /**
-     * 最大支付额度锁 0 正常 1 锁定
-     */
-    private Integer maxPayLock;
-
-    /**
-     * 最大支付额度
-     */
-    private BigDecimal maxPayAmount;
-
-    /**
-     * 月已用支付额度
-     */
-    private BigDecimal mouthPayAmount;
-
-    /**
-     * 月更新日期
-     */
-    private Date mouthUpdateDate;
-
-    /**
-     * 周已用额度
-     */
-    private BigDecimal weakerPayAmount;
-
-    /**
-     * 周更新日期
-     */
-    private Date weakerUpdateDate;
-
-    /**
-     * 日已用额度
-     */
-    private BigDecimal dayPayAmount;
-
-    /**
-     * 日更新日期
-     */
-    private Date dayUpdateDate;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 是否已删除 1 已删除 2 正常
-     */
-    private Integer isDelete;
-    /**
-     * 删除时间
-     */
-    private Date deleteTime;
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayWayExtBO.java

@@ -1,19 +0,0 @@
-package com.zanxiang.manage.domain.bo;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * 支付配置
- *
- * @author xufeng
- * @date 2022/6/29 10:56
- */
-@Data
-public class PayWayExtBO {
-
-    private Map<String, String> payDevice;
-
-    private Object config;
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/ChannelDTO.java

@@ -1,69 +0,0 @@
-package com.zanxiang.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-05
- * @description : 渠道信息
- */
-@Data
-public class ChannelDTO {
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 渠道名称
-     */
-    private String channelName;
-
-    /**
-     * 渠道唯一标识
-     */
-    private String channelSign;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 联系人
-     */
-    private String linkMan;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-
-    /**
-     * 职位
-     */
-    private String position;
-
-    /**
-     * 1 删除  0 正常
-     */
-    private Integer isDelete;
-
-    /**
-     * 删除时间
-     */
-    private LocalDateTime deleteTime;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

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

@@ -11,10 +11,9 @@ import com.zanxiang.mybatis.entity.GamePayWay;
 import java.util.List;
 
 /**
- * 游戏支付配置表 服务类接口
- *
- * @author xufeng
- * @date 2022-06-30 14:22
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏支付配置
  */
 public interface IGamePayWayService extends IService<GamePayWay> {
 

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

@@ -11,10 +11,9 @@ import com.zanxiang.mybatis.entity.GameStrategy;
 import java.util.List;
 
 /**
- * 游戏策略 服务类接口
- *
- * @author xufeng
- * @date 2022-07-01 11:38
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏策略
  */
 public interface IGameStrategyService extends IService<GameStrategy> {
 

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

@@ -7,10 +7,9 @@ import com.zanxiang.manage.domain.vo.LogPayCpVO;
 import com.zanxiang.mybatis.entity.LogPayCp;
 
 /**
- * 通知CP记录表 服务类接口
- *
- * @author xufeng
- * @date 2022-07-05 13:53
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 通知CP记录表
  */
 public interface ILogPayCpService extends IService<LogPayCp> {
 

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

@@ -13,10 +13,9 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 游戏应用表 服务类接口
- *
- * @author xufeng
- * @date 2022-06-20 15:16
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏应用
  */
 public interface IPayApplicationService extends IService<PayApplication> {
 

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

@@ -11,12 +11,10 @@ import com.zanxiang.mybatis.entity.PayMerchant;
 import java.util.Map;
 
 /**
- * 支付盒子 服务类接口
- *
- * @author xufeng
- * @date 2022-06-22 15:26
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 支付盒子
  */
-
 public interface IPayBoxService extends IService<PayBox> {
 
     /**

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

@@ -28,10 +28,9 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 游戏支付配置表 服务实现类
- *
- * @author xufeng
- * @date 2022-06-30 14:22
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏支付配置
  */
 @Service
 @Slf4j

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

@@ -34,10 +34,9 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
- * 游戏策略 服务实现类
- *
- * @author xufeng
- * @date 2022-07-01 11:38
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏支付策略
  */
 @Service
 public class GameStrategyServiceImpl extends ServiceImpl<GameStrategyMapper, GameStrategy> implements IGameStrategyService {

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

@@ -14,10 +14,9 @@ import org.springframework.stereotype.Service;
 import java.util.Objects;
 
 /**
- * 通知CP记录表 服务实现类
- *
- * @author xufeng
- * @date 2022-07-05 13:53
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 通知CP记录表
  */
 @Service
 public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, LogPayCp> implements ILogPayCpService {

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

@@ -33,10 +33,9 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * 支付应用管理
- *
- * @author xufeng
- * @date 2022-06-20 15:16
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 支付应用管理
  */
 @Service
 public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper, PayApplication> implements IPayApplicationService {

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

@@ -33,10 +33,9 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
- * 支付盒子 服务实现类
- *
- * @author xufeng
- * @date 2022-06-22 15:26
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 支付盒子
  */
 @Component
 @Slf4j