From 7e49674bd49578a657ae8c21e404f8b75a569dfe Mon Sep 17 00:00:00 2001 From: tangqian Date: Tue, 20 Jun 2023 10:01:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A1=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/shop/task/ReplenishmentTask.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java index 73be6d6dd..b608a59b6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java @@ -45,7 +45,7 @@ public class ReplenishmentTask { /** * 每天上午8点和下午3点执行补单计划 */ -// @Scheduled(cron = "0 0 8,15 * * ?") + @Scheduled(cron = "0 0 8,15 * * ?") @TenantIgnore public void replenishmentTask() { /** @@ -74,7 +74,7 @@ public class ReplenishmentTask { // 生成随机字符串 String nonceStr = generateNonceStr(); // 商户密钥 - String key = properties.getMchKey(); + String key = properties.getApiv3Key(); // 构建请求参数 Map params = new HashMap<>(); @@ -93,12 +93,12 @@ public class ReplenishmentTask { Map map = parseResponse(response); if ("SUCCESS".equals(map.get("trade_state")) && "SUCCESS".equals(map.get("result_code"))) { // 修改订单状态 -// orderDO.setPaid(1); -// orderDO.setIsReplenishment(1); -// orderDO.setReplenishmentName(map.toString()); -// rechargeOrderMapper.updateById(orderDO); -// // 写入 充值档位记录表 -// storeOrderService.addPhone(orderDO, outTradeNo); + orderDO.setPaid(1); + orderDO.setIsReplenishment(1); + orderDO.setReplenishmentName(map.toString()); + rechargeOrderMapper.updateById(orderDO); + // 写入 充值档位记录表 + storeOrderService.addPhone(orderDO, outTradeNo); } } @@ -274,7 +274,7 @@ public class ReplenishmentTask { // Map params = new HashMap<>(); // params.put("appid", appId); // params.put("mch_id", mchId); -// params.put("out_trade_no", "MEMBER_16700496905020866571"); +// params.put("out_trade_no", "MEMBER_1670049690502086657"); // params.put("nonce_str", nonceStr); // String sign = generateSign(params, key); // 生成签名 // params.put("sign", sign); From 3b4ad83dd0bc96896320e3553a12e807222aec50 Mon Sep 17 00:00:00 2001 From: tangqian Date: Tue, 20 Jun 2023 17:55:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=92=8C=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/recharge/vo/RechargeOrderPageReqVO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java index d53bbd444..8b3ee7bdc 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java @@ -142,6 +142,8 @@ public class RechargeOrderPageReqVO extends PageParam { /** * 申请退款时间 */ + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime startApplyTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime endApplyTime; }