From 9fd0012d440b299608f1b9ce99b1de25ed13c16e Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Thu, 5 Jun 2025 09:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSystemController.java | 69 ++++++++++--------- .../web/controller/app/baidu/BaiduSMS.java | 2 +- .../controller/common/CaptchaController.java | 8 +-- 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index 43bbc5bc..1c1b6a99 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -1360,38 +1360,45 @@ public class AppSystemController extends BaseController { } - //------------------------------------------设置订单剩余时间--------------------------------------------------------------------- - LocalDateTime now = orderListDto.getStartTime(); - Duration duration = Duration.between(now, orderListDto.getEndTime()); + // 只有当订单还未结束时才设置剩余时间 + if(orderListDto.getStatus().equals("0")){ + //------------------------------------------设置订单剩余时间--------------------------------------------------------------------- + LocalDateTime now = orderListDto.getStartTime(); + Duration duration = Duration.between(now, orderListDto.getEndTime()); - // 分解单位（同上） - long days = duration.toDays(); - long hours = duration.toHours() % 24; - long minutes = duration.toMinutes() % 60; - long seconds = duration.getSeconds() % 60; + // 分解单位（同上） + long days = duration.toDays(); + long hours = duration.toHours() % 24; + long minutes = duration.toMinutes() % 60; + long seconds = duration.getSeconds() % 60; + + String s = "剩余"; + if (days > 0){ + s = s + days + "天"; + } + if (hours > 0){ + s = s + hours + "小时"; + } + if (minutes > 0){ + s = s + minutes + "分"; + } + if (seconds > 0){ + s = s + seconds + "秒"; + } + + if (s.equals("剩余")){ + s = "订单已结束展示"; + } + + + orderListDto.setRemainTimeString(s); + //----------------------------------------------------------------设置订单剩余时间end-------------------------------------------------------------- - String s = "剩余"; - if (days > 0){ - s = s + days + "天"; } - if (hours > 0){ - s = s + hours + "小时"; + else{ + orderListDto.setRemainTimeString("订单已结束展示"); } - if (minutes > 0){ - s = s + minutes + "分"; - } - if (seconds > 0){ - s = s + seconds + "秒"; - } - - if (s.equals("剩余")){ - s = "订单已结束展示"; - } - - - orderListDto.setRemainTimeString(s); - //----------------------------------------------------------------设置订单剩余时间end-------------------------------------------------------------- orderListDto.setOrderInfoList(orderInfoList); @@ -2467,10 +2474,10 @@ public class AppSystemController extends BaseController { AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); throw new CaptchaException(); } - else{ - // 登录成功删除验证码 - redisCache.deleteObject(verifyKey); - } +// else{ +// // 登录成功删除验证码 +// redisCache.deleteObject(verifyKey); +// } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/BaiduSMS.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/BaiduSMS.java index 8298babb..73fa72c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/BaiduSMS.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/BaiduSMS.java @@ -23,7 +23,7 @@ public class BaiduSMS { SendMessageV3Request request = new SendMessageV3Request(); request.setMobile(phone); - request.setSignatureId("sms-sign-MiTUWW85061"); + request.setSignatureId("sms-sign-fgYPCP37534"); request.setTemplate("sms-tmpl-iLlROF73209"); Map contentVar = new HashMap<>(); contentVar.put("SMSvCode", code); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index ae7a3c06..8609204f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -198,8 +198,8 @@ public class CaptchaController { String countKey = CacheConstants.CAPTCHA_CODE_KEY_COUNT + phone; // 生成短信验证码 Random random = new Random(); -// String testCode = String.format("%04d", random.nextInt(10000)); // 0000-9999 - String testCode = "1234"; // 0000-9999 + String testCode = String.format("%04d", random.nextInt(10000)); // 0000-9999 +// String testCode = "1234"; // 0000-9999 // Constants.CAPTCHA_EXPIRATION 为验证码过期时间，这里是5 redisCache.setCacheObject(verifyKey, testCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); @@ -207,8 +207,8 @@ public class CaptchaController { redisCache.setCacheObject(countKey, 0, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); // 发送验证码 -// boolean flag = BaiduSMS.sendSMS(phone, testCode, "5"); - boolean flag = true; + boolean flag = BaiduSMS.sendSMS(phone, testCode, "5"); +// boolean flag = true; if (flag) { log.info("发送短信验证码成功:"+phone); System.out.println("发送短信验证码成功"+testCode);