From 843228d047b7709cd53f2f3e1dac4c141b8f63eb Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 31 Mar 2023 16:33:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=9C=89=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/FinanceRechargerServiceImpl.java | 2 +- .../validate/finance/FinanceRechargeSearchValidate.java | 7 +++++-- .../java/com/mdd/common/plugin/wechat/WxPayDriver.java | 1 - .../java/com/mdd/front/controller/IndexController.java | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) 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..c536d11e 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 @@ -175,7 +175,6 @@ public class WxPayDriver { payConfig.setPrivateKeyContent(privateKey); payConfig.setPrivateCertContent(privateCert); payConfig.setUseSandboxEnv(false); - WxPayService wxPayService = new WxPayServiceImpl(); wxPayService.setConfig(payConfig); } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index 3469e0d8..3f033717 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -9,6 +9,7 @@ import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.notice.NoticeRecordMapper; import com.mdd.common.plugin.notice.NoticeDriver; import com.mdd.common.plugin.notice.vo.NoticeSmsVo; +import com.mdd.common.plugin.wechat.WxMnpDriver; import com.mdd.common.util.StringUtils; import com.mdd.common.util.ToolUtils; import com.mdd.common.validator.annotation.IDMust; @@ -55,6 +56,7 @@ public class IndexController { @GetMapping("/config") @ApiOperation(value="公共配置") public AjaxResult> config() { + System.out.println(WxMnpDriver.mnp().getWxMaConfig()); Map map = iIndexService.config(); return AjaxResult.success(map); } From 4ba5f5b1dae549178d1ea5dd173d76608770261e Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 31 Mar 2023 16:35:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java | 1 - .../src/main/java/com/mdd/front/controller/IndexController.java | 2 -- 2 files changed, 3 deletions(-) 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 c536d11e..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; diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index 3f033717..3469e0d8 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -9,7 +9,6 @@ import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.notice.NoticeRecordMapper; import com.mdd.common.plugin.notice.NoticeDriver; import com.mdd.common.plugin.notice.vo.NoticeSmsVo; -import com.mdd.common.plugin.wechat.WxMnpDriver; import com.mdd.common.util.StringUtils; import com.mdd.common.util.ToolUtils; import com.mdd.common.validator.annotation.IDMust; @@ -56,7 +55,6 @@ public class IndexController { @GetMapping("/config") @ApiOperation(value="公共配置") public AjaxResult> config() { - System.out.println(WxMnpDriver.mnp().getWxMaConfig()); Map map = iIndexService.config(); return AjaxResult.success(map); } From 5cefba25c2ce3e9f30cb70f4bbbcf085ee4fb306 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 31 Mar 2023 16:41:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/admin/service/IFinanceWalletService.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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); }