mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

This commit is contained in:
Jason 2023-03-31 16:52:58 +08:00
parent 25805ce7dc 5cefba25c2
commit 5e5c99dfcd
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java
View File

@ -10,6 +10,14 @@ import com.mdd.common.core.PageResult;
*/ */
public interface IFinanceWalletService { public interface IFinanceWalletService {
/**
* 余额明细列表
*
* @author fzr
* @param pageValidate 分页参数
* @param searchValidate 搜索参数
* @return PageResult<FinanceWalletListVo>
*/
PageResult<FinanceWalletListVo> list(PageValidate pageValidate, FinanceWalletSearchValidate searchValidate); PageResult<FinanceWalletListVo> list(PageValidate pageValidate, FinanceWalletSearchValidate searchValidate);
} }

2
server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java
View File

@ -87,7 +87,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService {
"like:sn@t.order_sn:str", "like:sn@t.order_sn:str",
"=:payWay@t.pay_way:int", "=:payWay@t.pay_way:int",
"=:payStatus@t.pay_status:int", "=:payStatus@t.pay_status:int",
">=:payTime@pay_time:long" "datetime:startTime-endTime@create_time:long",
}); });
if (StringUtils.isNotEmpty(searchValidate.getKeyword())) { if (StringUtils.isNotEmpty(searchValidate.getKeyword())) {

7
server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java
View File

@ -24,7 +24,10 @@ public class FinanceRechargeSearchValidate implements Serializable {
@ApiModelProperty(value = "支付状态") @ApiModelProperty(value = "支付状态")
private Integer payStatus; private Integer payStatus;
@ApiModelProperty(value = "支付时间") @ApiModelProperty(value = "开始时间")
private Integer payTime; private Integer startTime;
@ApiModelProperty(value = "结束时间")
private Integer endTime;
} }

2
server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java
View File

@ -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.config.WxPayConfig;
import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService; 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.entity.setting.DevPayConfig;
import com.mdd.common.enums.ClientEnum; import com.mdd.common.enums.ClientEnum;
import com.mdd.common.mapper.setting.DevPayConfigMapper; import com.mdd.common.mapper.setting.DevPayConfigMapper;
@ -175,7 +174,6 @@ public class WxPayDriver {
payConfig.setPrivateKeyContent(privateKey); payConfig.setPrivateKeyContent(privateKey);
payConfig.setPrivateCertContent(privateCert); payConfig.setPrivateCertContent(privateCert);
payConfig.setUseSandboxEnv(false); payConfig.setUseSandboxEnv(false);
WxPayService wxPayService = new WxPayServiceImpl();
wxPayService.setConfig(payConfig); wxPayService.setConfig(payConfig);
} }