feat : 接口对接修改

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

@@ -1,6 +1,5 @@
 package com.zanxiang.manage.domain.params;
 
-import com.zanxiang.manage.domain.vo.PayDeviceChoiceVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -43,10 +42,10 @@ public class PayMerchantAddUpdateParam {
     private String merchantName;
 
     /**
-     * 支付类型列表
+     * 支付类型id列表
      */
-    @ApiModelProperty(notes = "支付类型列表")
-    private List<PayDeviceChoiceVO> payDeviceChoiceVOList;
+    @ApiModelProperty(notes = "支付类型id列表")
+    private List<Long> payDeviceIdList;
 
     /**
      * 登录账号

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

@@ -43,10 +43,16 @@ public class PayMerchantListVO {
     private String payWayName;
 
     /**
-     * 支付类型列表
+     * 支付类型id列表
      */
-    @ApiModelProperty(notes = "支付类型列表")
-    private List<PayDeviceChoiceVO> payDeviceChoiceVOList;
+    @ApiModelProperty(notes = "支付类型id列表")
+    private List<Long> payDeviceIdList;
+
+    /**
+     * 支付类型名称列表
+     */
+    @ApiModelProperty(notes = "支付类型名称列表")
+    private List<String> payDeviceNameList;
 
     /**
      * 商户号总收款

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

@@ -49,9 +49,8 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
     public boolean addOrUpdate(PayMerchantAddUpdateParam param) {
         Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
         String payDeviceIds = null;
-        if (CollectionUtils.isNotEmpty(param.getPayDeviceChoiceVOList())) {
-            payDeviceIds = param.getPayDeviceChoiceVOList().stream()
-                    .map(PayDeviceChoiceVO::getId)
+        if (CollectionUtils.isNotEmpty(param.getPayDeviceIdList())) {
+            payDeviceIds = param.getPayDeviceIdList().stream()
                     .map(String::valueOf).collect(Collectors.joining(","));
         }
         Long payWayId = param.getPayWayId();
@@ -153,18 +152,21 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         if (payMerchantListVO == null) {
             return null;
         }
-        List<PayDeviceChoiceVO> payDeviceChoiceVOList = new ArrayList<>();
+        List<Long> payDeviceIdList = new ArrayList<>();
+        List<String> payDeviceNameList = new ArrayList<>();
         String payDeviceIds = payMerchant.getPayDeviceIds();
         if (Strings.isNotBlank(payDeviceIds)) {
             String[] deviceIdArray = payDeviceIds.split(",");
             for (String deviceId : deviceIdArray) {
                 PayDeviceChoiceVO payDeviceChoiceVO = payDeviceMap.get(Long.valueOf(deviceId));
                 if (payDeviceChoiceVO != null) {
-                    payDeviceChoiceVOList.add(payDeviceChoiceVO);
+                    payDeviceIdList.add(payDeviceChoiceVO.getId());
+                    payDeviceNameList.add(payDeviceChoiceVO.getPayDeviceName());
                 }
             }
         }
-        payMerchantListVO.setPayDeviceChoiceVOList(payDeviceChoiceVOList);
+        payMerchantListVO.setPayDeviceIdList(payDeviceIdList);
+        payMerchantListVO.setPayDeviceNameList(payDeviceNameList);
         return payMerchantListVO;
     }