更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/paySetting/ProjectChannelController.java

@@ -4,6 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.projectAbout.PayChannelConfigAllPayModel;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigModel;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigParam;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigSearch;
@@ -52,7 +53,7 @@ public class ProjectChannelController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "数据列表-分页查询", description = "数据列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<PayChannelConfigModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) PayChannelConfigSearch param) {
+    public ResultContent<Page<PayChannelConfigAllPayModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) PayChannelConfigSearch param) {
         return projectChannelConfigService.page(param, pageable);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectChannelConfigService.java

@@ -119,9 +119,9 @@ public class ProjectChannelConfigService extends SuperService {
      * @param pageable
      * @return
      */
-    public ResultContent<Page<PayChannelConfigModel>> page(PayChannelConfigSearch param, Pageable pageable) {
+    public ResultContent<Page<PayChannelConfigAllPayModel>> page(PayChannelConfigSearch param, Pageable pageable) {
         Page<PayChannelConfig> page = payChannelConfigDao.page(pageable, param);
-        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
+        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toAllModel));
     }
 
     /**
@@ -151,7 +151,7 @@ public class ProjectChannelConfigService extends SuperService {
         if (ObjectUtils.isEmpty(entity)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
         }
-        return ResultContent.buildSuccess(toModel(entity));
+        return ResultContent.buildSuccess(toAllModel(entity));
     }
 
     public PayChannelConfig getProjectPayChannel(PaymentType paymentType) {
@@ -244,8 +244,13 @@ public class ProjectChannelConfigService extends SuperService {
 
             List<PaymentTypeInfoModel> paymentTypes = new ArrayList<PaymentTypeInfoModel>();
             for (PaymentType paymentType : PaymentType.values()) {
-
+                if (paymentType.getChannelType() != null && paymentType.getChannelType() == channelType) {
+                    PaymentTypeInfoModel paymentTypeInfoModel = new PaymentTypeInfoModel();
+                    paymentTypeInfoModel.setPaymentType(paymentType);
+                    paymentTypes.add(paymentTypeInfoModel);
+                }
             }
+            model.setPaymentTypes(paymentTypes);
             paymentChannelTypes.add(model);
         }
         return paymentChannelTypes;