feat : sdk对接修改

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

@@ -103,6 +103,12 @@ public class GamePayWayListVO {
          */
         @ApiModelProperty(notes = "支付应用appId")
         private String appId;
+
+        /**
+         * 支付应用名称
+         */
+        @ApiModelProperty(notes = "支付应用名称")
+        private String appName;
     }
 
     @Data
@@ -132,11 +138,23 @@ public class GamePayWayListVO {
         @ApiModelProperty(notes = "支付应用appId")
         private String appId;
 
+        /**
+         * 微信应用名称
+         */
+        @ApiModelProperty(notes = "微信应用名称")
+        private String appName;
+
         /**
          * 商户号
          */
         @ApiModelProperty(notes = "商户号")
         private String merchantNo;
+
+        /**
+         * 商户名称
+         */
+        @ApiModelProperty(notes = "商户名称")
+        private String merchantName;
     }
 
     @Data

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

@@ -58,6 +58,9 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
     @Autowired
     private IPayApplicationService payApplicationService;
 
+    @Autowired
+    private IPayMerchantService payMerchantService;
+
     @Override
     public boolean addOrUpdate(GamePayWayAddUpdateParam param) {
         Long id = param.getId();
@@ -134,16 +137,17 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
         Map<Long, GameDTO> gameMap = gameService.gameMap();
         Map<Long, PayDeviceDTO> payDeviceMap = payDeviceService.payDeviceMap();
         Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
+        Map<String, PayMerchantDTO> payMerchantMap = payMerchantService.payMerchantMap();
         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())
                 .orderByDesc(GamePayWay::getCreateTime))
-                .convert(gamePayWay -> this.toVO(gameMap, gameCategoryMap, gamePayWay, payWayMap, payDeviceMap));
+                .convert(gamePayWay -> this.toVO(gameMap, gameCategoryMap, gamePayWay, payMerchantMap, payWayMap, payDeviceMap));
     }
 
-    private GamePayWayListVO toVO(Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap,
-                                  GamePayWay gamePayWay, Map<Long, PayWayDTO> payWayMap, Map<Long, PayDeviceDTO> payDeviceMap) {
+    private GamePayWayListVO toVO(Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap, GamePayWay gamePayWay,
+                                  Map<String, PayMerchantDTO> payMerchantMap, Map<Long, PayWayDTO> payWayMap, Map<Long, PayDeviceDTO> payDeviceMap) {
         GamePayWayListVO gamePayWayListVO = BeanUtils.copy(gamePayWay, GamePayWayListVO.class);
         if (gamePayWayListVO == null) {
             return null;
@@ -183,7 +187,12 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
             }
             wxPayConfigBean.setThumbUrl(gamePayWay.getThumbUrl());
             wxPayConfigBean.setAppId(gamePayWay.getAppId());
+            wxPayConfigBean.setAppName(gamePayWay.getAppName());
             wxPayConfigBean.setMerchantNo(gamePayWay.getMerchantNo());
+            PayMerchantDTO payMerchantDTO = payMerchantMap.get(gamePayWay.getMerchantNo());
+            if (payMerchantDTO != null) {
+                wxPayConfigBean.setMerchantName(payMerchantDTO.getMerchantName());
+            }
             gamePayWayListVO.setWxPayConfig(wxPayConfigBean);
         }
         if (Objects.equals(PayWayEnum.MI_PAY.getPayWayId(), payWayId.intValue())) {