feat : sdk后台修改

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

@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 支付盒子
  *
@@ -16,10 +13,11 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class PayBoxDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class PayBoxDTO {
 
+    /**
+     * 主键id
+     */
     private Integer id;
 
     /**
@@ -27,38 +25,23 @@ public class PayBoxDTO implements Serializable {
      */
     private String name;
 
-    /**
-     * 支付名称
-     */
-    private String payName;
-
     /**
      * 应用id
      */
-    private Integer payApplicationId;
+    private String appId;
 
     /**
-     * 商户号id（多个逗号分割,id,）
+     * 商户号（多个逗号分割）
      */
-    private String payMerchantId;
+    private String merchantNos;
 
     /**
-     * 盒子类型 1、金币 2、红包
+     * 商城小程序类型 1、商城百货 2、商城美妆 3、商城内容
      */
-    private Integer type;
+    private Integer storeType;
 
     /**
      * 描述
      */
-    private String desc;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
+    private String remark;
 }

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

@@ -77,6 +77,18 @@ public class GamePayWayListVO {
     @ApiModelProperty(notes = "状态, 0 : 可用, 1 : 不可用")
     private Integer status;
 
+    /**
+     * 盒子id
+     */
+    @ApiModelProperty(notes = "盒子id")
+    private Long payBoxId;
+
+    /**
+     * 盒子名称
+     */
+    @ApiModelProperty(notes = "盒子名称")
+    private String payBoxName;
+
     /**
      * 米大师支付配置
      */

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

@@ -2,6 +2,7 @@ package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.manage.domain.dto.PayBoxDTO;
 import com.zanxiang.manage.domain.params.PayBoxAddUpdateParam;
 import com.zanxiang.manage.domain.params.PayBoxListParam;
 import com.zanxiang.manage.domain.vo.PayBoxListVO;
@@ -46,4 +47,12 @@ public interface IPayBoxService extends IService<PayBox> {
      * @return boolean
      */
     boolean deleteById(Long id);
+
+    /**
+     * 通过支付盒子id
+     *
+     * @param payBoxId 盒子支付id
+     * @return {@link PayBoxDTO}
+     */
+    PayBoxDTO getByPayBoxId(Long payBoxId);
 }

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

@@ -47,6 +47,9 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
     @Autowired
     private IPayWayService payWayService;
 
+    @Autowired
+    private IPayBoxService payBoxService;
+
     @Override
     public IPage<GamePayWayListVO> pageList(GamePayWayListParam param) {
         Map<Long, GameCategoryDTO> gameCategoryMap = gameCategoryService.gameCategoryMap();
@@ -64,9 +67,10 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
     private GamePayWayListVO toVO(Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap,
                                   GamePayWay gamePayWay, Map<Long, PayWayDTO> payWayMap, Map<Long, PayDeviceDTO> payDeviceMap) {
         GamePayWayListVO gamePayWayListVO = BeanUtils.copy(gamePayWay, GamePayWayListVO.class);
-        if (gamePayWay == null) {
+        if (gamePayWayListVO == null) {
             return null;
         }
+        //游戏信息
         GameDTO gameDTO = gameMap.get(gamePayWayListVO.getGameId());
         if (gameDTO != null) {
             gamePayWayListVO.setGameName(gameDTO.getName());
@@ -76,6 +80,7 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
                 gamePayWayListVO.setGameCategory(gameCategoryDTO.getName());
             }
         }
+        //支付方式和类型
         Long payWayId = gamePayWay.getPayWayId();
         PayWayDTO payWayDTO = payWayMap.get(payWayId);
         if (payWayDTO != null) {
@@ -85,6 +90,7 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
         if (payDeviceDTO != null) {
             gamePayWayListVO.setPayDeviceName(payDeviceDTO.getPayDeviceName());
         }
+        //支付配置
         if (Objects.equals(PayWayEnum.ALI_PAY.getPayWayId(), payWayId.intValue())) {
             GamePayWayListVO.AliPayConfigBean aliPayConfigBean = new GamePayWayListVO.AliPayConfigBean();
             aliPayConfigBean.setAppId(gamePayWay.getAppId());
@@ -106,6 +112,12 @@ 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-manage/src/main/java/com/zanxiang/manage/service/impl/PayBoxServiceImpl.java

@@ -13,6 +13,7 @@ import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.dto.PayApplicationDTO;
+import com.zanxiang.manage.domain.dto.PayBoxDTO;
 import com.zanxiang.manage.domain.dto.PayMerchantDTO;
 import com.zanxiang.manage.domain.params.PayBoxAddUpdateParam;
 import com.zanxiang.manage.domain.params.PayBoxListParam;
@@ -20,6 +21,7 @@ import com.zanxiang.manage.domain.vo.PayBoxListVO;
 import com.zanxiang.manage.service.IPayApplicationService;
 import com.zanxiang.manage.service.IPayBoxService;
 import com.zanxiang.manage.service.IPayMerchantService;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.mybatis.entity.PayBox;
 import com.zanxiang.mybatis.mapper.PayBoxMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -181,4 +183,13 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
     public boolean deleteById(Long id) {
         return super.removeById(id);
     }
+
+    @Override
+    public PayBoxDTO getByPayBoxId(Long payBoxId) {
+        PayBox payBox = super.getById(payBoxId);
+        if (payBox == null) {
+            return null;
+        }
+        return BeanUtil.copy(payBox, PayBoxDTO.class);
+    }
 }