diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/entity/PayProduct.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/entity/PayProduct.java index 5a981530a..785588abd 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/entity/PayProduct.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/entity/PayProduct.java @@ -2,18 +2,14 @@ package cn.daxpay.open.payment.masterdata.constants.product.entity; import cn.daxpay.open.platform.common.mybatisplus.function.ToResult; import cn.daxpay.open.platform.common.mybatisplus.base.MpBaseEntity; -import cn.daxpay.open.platform.common.mybatisplus.handler.type.StringListTypeHandler; import cn.daxpay.open.payment.masterdata.constants.product.convert.PayProductConvert; import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductResult; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.List; - /// # 支付产品 /// @EqualsAndHashCode(callSuper = true) @@ -38,10 +34,6 @@ public class PayProduct extends MpBaseEntity implements ToResult settlePeriods; - /// 排序 private Integer sortNo; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/result/PayProductResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/result/PayProductResult.java index c4354c77f..83c5533da 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/result/PayProductResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/result/PayProductResult.java @@ -37,9 +37,6 @@ public class PayProductResult extends BaseResult { @Schema(description = "图标") private String icon; - @Schema(description = "支持的结算周期列表") - private List settlePeriods; - @Schema(description = "排序") private Integer sortNo; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java index 765475b9f..c6e0129de 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java @@ -114,7 +114,6 @@ public class PayProductService { result.setSortNo(dbRow.getSortNo()); result.setDescription(dbRow.getDescription()); result.setIcon(dbRow.getIcon()); - result.setSettlePeriods(dbRow.getSettlePeriods()); if (dbRow.getSandbox() != null) { result.setSandbox(dbRow.getSandbox()); }