From 4c4c469db241e93609ac434a0bfcae5c3cdb7f19 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Dec 2024 22:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 6 +++--- .../sqx/modules/pay/controller/app/AliPayController.java | 2 +- .../com/sqx/modules/pay/service/impl/DyServiceImpl.java | 4 ++-- .../com/sqx/modules/pay/service/impl/KsServiceImpl.java | 2 +- .../com/sqx/modules/pay/service/impl/WxServiceImpl.java | 4 ++-- 5 files changed, 9 insertions(+), 9 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 eb269973..a09738d2 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -105,13 +105,13 @@ public class TempOrdersTask { logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); logger.info("order：{} ", JSONUtil.toJsonStr(order)); updateOrderStatus(payDetails, order); - }else { + } else { order.setStatus(3); payDetails.setState(2); ordersDao.updateById(order); payDetailsDao.updateById(payDetails); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); logger.error("订单数据处理异常：", e); } @@ -126,7 +126,7 @@ public class TempOrdersTask { String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(), 1, format, payDetails.getTradeNo()); + payDetailsDao.updateState(payDetails.getId(), 1, format, payDetails.getTradeNo(), payDetails.getThirdOrderNo()); order.setPayWay(9); order.setStatus(1); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 207ded4a..b0c40bce 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -114,7 +114,7 @@ public class AliPayController { PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo); if (payDetails.getState() == 0) { String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(), 1, format, tradeNo); + payDetailsDao.updateState(payDetails.getId(), 1, format, tradeNo,""); if (payDetails.getType() == 1) { Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); orders.setPayWay(4); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java index ad2576af..c7f28aca 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java @@ -406,7 +406,7 @@ public class DyServiceImpl implements DyService { PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo); if(payDetails.getState()==0){ String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(),1,format,""); + payDetailsDao.updateState(payDetails.getId(),1,format,"",""); if(payDetails.getType()==1){ Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); orders.setPayWay(7); @@ -493,7 +493,7 @@ public class DyServiceImpl implements DyService { PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo); if(payDetails.getState()==0){ String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(),1,format,""); + payDetailsDao.updateState(payDetails.getId(),1,format,"",""); if(payDetails.getType()==1){ Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); orders.setPayWay(7); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java index 6e7437e2..2853e907 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java @@ -182,7 +182,7 @@ public class KsServiceImpl implements KsService { PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo); if(payDetails.getState()==0){ String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(),1,format,""); + payDetailsDao.updateState(payDetails.getId(),1,format,"",""); if(payDetails.getType()==1){ Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); orders.setPayWay(8); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index df2331e0..0335b780 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -278,7 +278,7 @@ public class WxServiceImpl implements WxService { PayDetails payDetails = payDetailsDao.selectByOrderId(out_trade_no); if(payDetails.getState()==0){ String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(),1,format,""); + payDetailsDao.updateState(payDetails.getId(),1,format,"",""); if(payDetails.getType()==1){ Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); orders.setPayTime(DateUtils.format(new Date())); @@ -357,7 +357,7 @@ public class WxServiceImpl implements WxService { PayDetails payDetails = payDetailsDao.selectByOrderId(out_trade_no); if(payDetails.getState()==0){ String format = sdf.format(new Date()); - payDetailsDao.updateState(payDetails.getId(),1,format,""); + payDetailsDao.updateState(payDetails.getId(),1,format,"",""); if(payDetails.getType()==1){ Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); orders.setPayTime(DateUtils.format(new Date()));