feat : 游戏接口修改

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/mapper/GamePayWayListMapper.java

@@ -1,24 +0,0 @@
-package com.zanxiang.manage.domain.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zanxiang.manage.domain.vo.GamePayWayListVO;
-import com.zanxiang.mybatis.entity.GamePayWay;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * @author xufeng
- * @date 2022/6/29 16:32
- */
-public interface GamePayWayListMapper extends BaseMapper<GamePayWay> {
-
-    @Select("<script> SELECT p.*, g.`name` as gameName,c.`name` as gameType, w.pay_name as payWayName, b.`name` as payBoxName  FROM h_game_pay_way p LEFT JOIN h_game g ON t.game_id = g.id LEFT JOIN t_pay_box b ON p.pay_box_id = b.id LEFT JOIN t_pay_way w ON w.id = p.pay_way_id LEFT JOIN t_game_category c ON g.category = c.id " +
-            "where p.is_delete=0 " +
-            "<when test='gameName != null'> and g.`name` like CONCAT('%', #{gameName}, '%') </when>" +
-            "<when test='payWayId != null'> and p.pay_way_id = #{payWayId} </when>" +
-            "<when test='status != null'> and p.status = #{status} </when>" +
-            " </script>")
-    IPage<GamePayWayListVO> List(Page<GamePayWay> page, @Param("gameName") String gameName, @Param("payWayId") String payWayId, @Param("status") String status);
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/GamePayWayListParam.java

@@ -13,16 +13,12 @@ import lombok.Data;
 @Data
 public class GamePayWayListParam extends BasePage<GamePayWay> {
 
-    @ApiModelProperty(notes = "游戏名称")
-    private String gameName;
-
-    @ApiModelProperty(notes = "游戏类型")
-    private String gameType;
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
 
     @ApiModelProperty(notes = "支付方式id")
     private Integer payWayId;
 
-
     @ApiModelProperty(notes = "状态 1 不可用 0 可用")
     private Integer status;
 

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/GamePayWayListVO.java

@@ -1,59 +1,42 @@
 package com.zanxiang.manage.domain.vo;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * @author : xufeng
  * @time : 2022-06-30
  * @description : 游戏支付配置表
  */
 @Data
-public class GamePayWayListVO implements Serializable {
+public class GamePayWayListVO {
 
-    /**
-     * 主键id
-     */
+    @ApiModelProperty(notes = "主键id")
     private String id;
 
-    /**
-     * 游戏id
-     */
     @ApiModelProperty(notes = "游戏id")
     private String gameId;
 
     @ApiModelProperty(notes = "游戏名称")
     private String gameName;
 
-    @ApiModelProperty(notes = "游戏类型")
-    private String gameType;
+    @ApiModelProperty(notes = "游戏应用类型id")
+    private Long gameCategoryId;
+
+    @ApiModelProperty(notes = "游戏应用类型名称")
+    private String gameCategory;
 
     @ApiModelProperty(notes = "支付方式id")
-    private Integer payWayId;
+    private Integer payWayCode;
 
-    @ApiModelProperty(notes = "支付方式")
+    @ApiModelProperty(notes = "支付方式名称")
     private String payWayName;
 
-    /**
-     * 状态 1 不可用 2 可用
-     */
-    @ApiModelProperty(notes = "状态 1 不可用 0 可用")
-    private Integer status;
+    @ApiModelProperty(notes = "商户号")
+    private String merchantNo;
 
-    /**
-     * 支付配置json (存储根据payway设置后，配置的具体商户号信息)
-     */
-    private String payConfig;
-
-    @ApiModelProperty(notes = "是否已删除 1 已删除 0 正常")
-    private Integer isDelete;
-
-    @ApiModelProperty(notes = "备注")
-    private String remark;
+    @ApiModelProperty(notes = "商户名称")
+    private String merchantName;
 
     @ApiModelProperty(notes = "支付盒子id")
     private Long payBoxId;
@@ -61,8 +44,10 @@ public class GamePayWayListVO implements Serializable {
     @ApiModelProperty(notes = "支付盒子")
     private String payBoxName;
 
+    @ApiModelProperty(notes = "备注")
+    private String remark;
+
+    @ApiModelProperty(notes = "状态 1 不可用 0 可用")
+    private Integer status;
 
-    @ApiModelProperty(notes = "支付商户号id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long payMerchantId;
 }

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

@@ -2,7 +2,6 @@ package com.zanxiang.manage.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.DeleteEnum;
 import com.zanxiang.common.enums.PayWayEnum;
@@ -10,7 +9,6 @@ import com.zanxiang.common.enums.StatusEnum;
 import com.zanxiang.common.exception.ParamNullException;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.mapper.GamePayWayListMapper;
 import com.zanxiang.manage.domain.params.GameAnalogPayParam;
 import com.zanxiang.manage.domain.params.GamePayWayListParam;
 import com.zanxiang.manage.domain.params.GamePayWayParam;
@@ -39,9 +37,6 @@ import java.util.stream.Collectors;
 @Service
 public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePayWay> implements GamePayWayService {
 
-    @Autowired
-    private GamePayWayListMapper gamePayWayListMapper;
-
     @Autowired
     private PayMerchantService payMerchantService;
 
@@ -85,11 +80,17 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
 
     @Override
     public IPage<GamePayWayListVO> list(GamePayWayListParam param) {
+        return super.page(param.toPage(), new LambdaQueryWrapper<GamePayWay>()
+                .eq(param.getGameId() != null, GamePayWay::getGameId, param.getGameId())
+                .eq(param.getPayWayId() != null, GamePayWay::getPayWayId, param.getPayWayId())
+                .eq(param.getStatus() != null, GamePayWay::getStatus, param.getStatus())).convert(this::toVO);
+    }
 
-        Page<GamePayWay> page = new Page<>(param.getPageNum(), param.getPageSize());
-        String payWayId = param.getPayWayId() == null ? null : String.valueOf(param.getPayWayId());
-        String status = param.getStatus() == null ? null : String.valueOf(param.getStatus());
-        return gamePayWayListMapper.List(page, param.getGameName(), payWayId, status);
+    private GamePayWayListVO toVO(GamePayWay gamePayWay) {
+        if (gamePayWay == null) {
+            return null;
+        }
+        return BeanUtils.copy(gamePayWay, GamePayWayListVO.class);
     }
 
     /**