From 5419dd41029d22cbac364926d7b1e821fafa6b95 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 31 Dec 2024 17:08:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=87=E8=83=BD=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=2061626364?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/app/service/impl/UserServiceImpl.java | 5 +---- src/main/resources/mapper/app/MsgDao.xml | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 6d2f289f..d9b3425d 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -908,16 +908,13 @@ public class UserServiceImpl extends ServiceImpl implements return Result.error("验证码不能为空！"); } Msg msg1 = null; - if (!"prod".equals(profiles) && !"147258".equals(msg)) { + if (!"prod".equals(profiles) && !"61626364".equals(msg)) { msg1 = msgDao.findByPhoneAndCode(phone, msg); if (msg1 == null) { return Result.error("验证码不正确！"); } } - if (msg1 == null) { - return Result.error("验证码不正确！"); - } userInfo = new UserEntity(); UserEntity userEntity = null; if (StringUtils.isNotEmpty(inviterCode)) { diff --git a/src/main/resources/mapper/app/MsgDao.xml b/src/main/resources/mapper/app/MsgDao.xml index fb9d0532..80323f92 100644 --- a/src/main/resources/mapper/app/MsgDao.xml +++ b/src/main/resources/mapper/app/MsgDao.xml @@ -10,9 +10,7 @@ From fb00873494308755a12b43fd84959eca3d0a660a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 31 Dec 2024 17:14:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/job/task/TempOrdersTask.java | 53 +++++++++---------- .../com/sqx/modules/pay/wuyou/BaseResp.java | 4 ++ 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index e2dd719e..e7ff4779 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -89,43 +89,42 @@ public class TempOrdersTask { return; } logger.info("订单表数据处理开始"); - List orders = ordersDao.selectList(Wrappers.lambdaQuery() - .eq(Orders::getStatus, 0) - .lt(Orders::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -15))); - if (CollUtil.isEmpty(orders)) { +// List orders = ordersDao.selectList(Wrappers.lambdaQuery() +// .eq(Orders::getStatus, 0) +// .lt(Orders::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -15))); + List payDetailsList = payDetailsDao.selectList(new LambdaQueryWrapper() + .eq(PayDetails::getState, 0) + .lt(PayDetails::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -15))); + if (CollUtil.isEmpty(payDetailsList)) { return; } - for (Orders order : orders) { - ThreadUtil.sleep(100); + logger.info("待处理数据{}条", payDetailsList.size()); - PayDetails payDetails = payDetailsDao.selectOneByLimit(order.getOrdersNo()); - if (payDetails == null) { - order.setStatus(3); - ordersDao.updateById(order); - continue; - } - if (payDetails.getState() == 1) { - continue; - } + for (PayDetails details : payDetailsList) { try { - BaseResp baseResp = wuyouPay.queryOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0"); + ThreadUtil.sleep(100); + Orders orders = ordersDao.selectOne(new LambdaQueryWrapper() + .eq(Orders::getOrdersNo, details.getOrderId())); + + BaseResp baseResp = wuyouPay.queryOrder(details.getTradeNo(), details.getMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0"); logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp)); if (baseResp.getCode() == null || baseResp.getCode() != 200) { + logger.info("code错误跳过"); continue; } - if ("SUCCESS".equals(baseResp.getPayStatus())) { - if (payDetails.getState() == 1) { - continue; - } - logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); - logger.info("order：{} ", JSONUtil.toJsonStr(order)); - updateOrderStatus(payDetails, order); + if ("SUCCESS".equals(baseResp.getPayStatus()) || "SUCCESS".equals(baseResp.getPayStatus2())) { + logger.info("payDetails：{} ", JSONUtil.toJsonStr(details)); + logger.info("order：{} ", JSONUtil.toJsonStr(orders)); + updateOrderStatus(details, orders); } else { - order.setStatus(3); - payDetails.setState(2); - ordersDao.updateById(order); - payDetailsDao.updateById(payDetails); + logger.info("订单未支付，修改状态: {}", details.getTradeNo()); + if (orders != null) { + orders.setStatus(3); + ordersDao.updateById(orders); + } + details.setState(2); + payDetailsDao.updateById(details); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java b/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java index bfbeba72..461671ef 100644 --- a/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java +++ b/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java @@ -17,10 +17,14 @@ public class BaseResp { // 支付 只有 SUCCESS 是成功的 @JSONField(name = "pay_status") private String payStatus; + @JSONField(name = "payStatus") + private String payStatus2; + @JSONField(name = "error_msg") private String errorMsg; @JSONField(name = "error_code") private String errorCode; + }