diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java index 76cad1e3..d407161c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java @@ -10,6 +10,14 @@ import com.mdd.common.core.PageResult; */ public interface IFinanceWalletService { + /** + * 余额明细列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ PageResult list(PageValidate pageValidate, FinanceWalletSearchValidate searchValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index 1da66f74..8152af57 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -87,7 +87,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { "like:sn@t.order_sn:str", "=:payWay@t.pay_way:int", "=:payStatus@t.pay_status:int", - ">=:payTime@pay_time:long" + "datetime:startTime-endTime@create_time:long", }); if (StringUtils.isNotEmpty(searchValidate.getKeyword())) { diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java index a9a85625..6d570dfa 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java @@ -24,7 +24,10 @@ public class FinanceRechargeSearchValidate implements Serializable { @ApiModelProperty(value = "支付状态") private Integer payStatus; - @ApiModelProperty(value = "支付时间") - private Integer payTime; + @ApiModelProperty(value = "开始时间") + private Integer startTime; + + @ApiModelProperty(value = "结束时间") + private Integer endTime; } diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java index 59ade0c5..aaabfb15 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java @@ -9,7 +9,6 @@ import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; -import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; import com.mdd.common.entity.setting.DevPayConfig; import com.mdd.common.enums.ClientEnum; import com.mdd.common.mapper.setting.DevPayConfigMapper; @@ -175,7 +174,6 @@ public class WxPayDriver { payConfig.setPrivateKeyContent(privateKey); payConfig.setPrivateCertContent(privateCert); payConfig.setUseSandboxEnv(false); - WxPayService wxPayService = new WxPayServiceImpl(); wxPayService.setConfig(payConfig); }