zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/17/head
Jruome 2023-06-21 10:28:01 +08:00
parent 6fa7a0103f 82d5f5408e
commit 2ac2faf592
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
View File

@ -142,6 +142,8 @@ public class RechargeOrderPageReqVO extends PageParam {
/** /**
* 申请退款时间 * 申请退款时间
*/ */
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime startApplyTime; private LocalDateTime startApplyTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endApplyTime; private LocalDateTime endApplyTime;
} }

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java
View File

@ -45,7 +45,7 @@ public class ReplenishmentTask {
/** /**
* 每天上午8点和下午3点执行补单计划 * 每天上午8点和下午3点执行补单计划
*/ */
@Scheduled(cron = "0 0 9,15 * * ?") @Scheduled(cron = "0 0 8,15 * * ?")
@TenantIgnore @TenantIgnore
public void replenishmentTask() { public void replenishmentTask() {
/** /**
@ -274,7 +274,7 @@ public class ReplenishmentTask {
// Map<String, String> params = new HashMap<>(); // Map<String, String> params = new HashMap<>();
// params.put("appid", appId); // params.put("appid", appId);
// params.put("mch_id", mchId); // params.put("mch_id", mchId);
// params.put("out_trade_no", "MEMBER_1669714426202210305"); // params.put("out_trade_no", "MEMBER_1670049690502086657");
// params.put("nonce_str", nonceStr); // params.put("nonce_str", nonceStr);
// String sign = generateSign(params, key); // 生成签名 // String sign = generateSign(params, key); // 生成签名
// params.put("sign", sign); // params.put("sign", sign);