feat : sdk后台修改

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

@@ -77,18 +77,6 @@ public class GamePayWayListVO {
     @ApiModelProperty(notes = "状态, 0 : 可用, 1 : 不可用")
     private Integer status;
 
-    /**
-     * 盒子id
-     */
-    @ApiModelProperty(notes = "盒子id")
-    private Long payBoxId;
-
-    /**
-     * 盒子名称
-     */
-    @ApiModelProperty(notes = "盒子名称")
-    private String payBoxName;
-
     /**
      * 米大师支付配置
      */
@@ -126,6 +114,12 @@ public class GamePayWayListVO {
         @ApiModelProperty(notes = "支付盒子id")
         private Long payBoxId;
 
+        /**
+         * 支付盒子名称
+         */
+        @ApiModelProperty(notes = "支付盒子名称")
+        private String payBoxName;
+
         /**
          * 客服消息卡片图片地址
          */

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

@@ -176,7 +176,11 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
         }
         if (Objects.equals(PayWayEnum.WX_PAY.getPayWayId(), payWayId.intValue())) {
             GamePayWayListVO.WxPayConfigBean wxPayConfigBean = new GamePayWayListVO.WxPayConfigBean();
-            wxPayConfigBean.setPayBoxId(gamePayWay.getPayBoxId());
+            if (gamePayWay.getPayBoxId() != null) {
+                PayBoxDTO payBoxDTO = payBoxService.getByPayBoxId(gamePayWay.getPayBoxId());
+                wxPayConfigBean.setPayBoxId(gamePayWay.getPayBoxId());
+                wxPayConfigBean.setPayBoxName(payBoxDTO.getName());
+            }
             wxPayConfigBean.setThumbUrl(gamePayWay.getThumbUrl());
             wxPayConfigBean.setAppId(gamePayWay.getAppId());
             wxPayConfigBean.setMerchantNo(gamePayWay.getMerchantNo());
@@ -190,11 +194,6 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
             miPayConfigBean.setAppKeyDev(gameAppletDTO.getMiPayAppKeyDev());
             gamePayWayListVO.setMiPayConfig(miPayConfigBean);
         }
-        //盒子信息
-        if (gamePayWayListVO.getPayBoxId() != null) {
-            PayBoxDTO payBoxDTO = payBoxService.getByPayBoxId(gamePayWayListVO.getPayBoxId());
-            gamePayWayListVO.setPayBoxName(payBoxDTO.getName());
-        }
         //返回
         return gamePayWayListVO;
     }

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

@@ -2,6 +2,7 @@ package com.zanxiang.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;
@@ -46,6 +47,7 @@ public class PayDevice {
     /**
      * 删除状态 1 已删除 0 正常
      */
+    @TableLogic
     private Boolean isDelete;
 
     /**