feat : 接口对接修改

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

@@ -30,7 +30,7 @@ public class PayMerchantListParam extends BasePage<PayMerchant> {
      * 商户平台id
      */
     @ApiModelProperty(notes = "商户平台id")
-    private String payWayId;
+    private Integer payWayId;
 
     /**
      * 状态, 0 : 正常, 1 : 不可用

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

@@ -1,7 +1,10 @@
 package com.zanxiang.manage.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author : lingfeng
@@ -9,6 +12,9 @@ import lombok.Data;
  * @description : 支付方式选择列表
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class PayWayChoiceVO {
 
     /**

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

@@ -42,6 +42,10 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
 
     @Override
     public IPage<PayMerchantListVO> pageList(PayMerchantListParam param) {
+        //米大师商户与微信商户同类型
+        if (Objects.equals(param.getPayWayId(), PayWayEnum.MI_PAY.getPayWayId())) {
+            param.setPayWayId(PayWayEnum.WX_PAY.getPayWayId());
+        }
         return page(param.toPage(), new LambdaQueryWrapper<PayMerchant>()
                 .eq(param.getMerchantNo() != null, PayMerchant::getMerchantNo, param.getMerchantNo())
                 .eq(param.getPayWayId() != null, PayMerchant::getPayWayId, param.getPayWayId())

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

@@ -12,6 +12,7 @@ import com.zanxiang.mybatis.mapper.PayWayMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +33,12 @@ public class PayWayServiceImpl extends ServiceImpl<PayWayMapper, PayWay> impleme
         List<PayWay> payWayList = super.list(new LambdaQueryWrapper<PayWay>()
                 .select(PayWay::getId, PayWay::getPayWayName)
         );
-        return BeanUtils.copyList(payWayList, PayWayChoiceVO.class);
+        List<PayWayChoiceVO> payWayChoiceVOList = new ArrayList<>();
+        payWayList.forEach(payWay -> payWayChoiceVOList.add(PayWayChoiceVO.builder()
+                .id(payWay.getId())
+                .payName(payWay.getPayWayName())
+                .build()));
+        return payWayChoiceVOList;
     }
 
     @Override