Explorar o código

feat : 接口对接修改

bilingfeng %!s(int64=2) %!d(string=hai) anos
pai
achega
438a8aece4

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

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

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

@@ -49,8 +49,10 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
     public boolean addOrUpdate(PayMerchantAddUpdateParam param) {
     public boolean addOrUpdate(PayMerchantAddUpdateParam param) {
         Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
         Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
         String payDeviceIds = null;
         String payDeviceIds = null;
-        if (CollectionUtils.isNotEmpty(param.getPayDeviceIdList())) {
-            payDeviceIds = param.getPayDeviceIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
+        if (CollectionUtils.isNotEmpty(param.getPayDeviceChoiceVOList())) {
+            payDeviceIds = param.getPayDeviceChoiceVOList().stream()
+                    .map(PayDeviceChoiceVO::getId)
+                    .map(String::valueOf).collect(Collectors.joining(","));
         }
         }
         Long payWayId = param.getPayWayId();
         Long payWayId = param.getPayWayId();
         String payConfig = null;
         String payConfig = null;