From ec11f3abf2d714d570b1e683c2c5b6963ed2292b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 19 Jul 2024 10:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=94=AF=E4=BB=98=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controller/app/AliPayController.java | 49 +++++++++---------- .../pay/service/impl/WxServiceImpl.java | 42 +++++++--------- 2 files changed, 41 insertions(+), 50 deletions(-) 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 2cdc687..a6f8b9c 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 @@ -1400,34 +1400,30 @@ public class AliPayController { } } - String isTravelFree = commonInfoService.findOne(460).getValue(); - if(isTravelFree.equals("是")){ - payPackageOrderResult(orders.getOrdersNo()); - }else { - //通知页面地址 - CommonInfo one = commonInfoService.findOne(19); - String returnUrl = one.getValue() + "/#/pages/task/recharge"; - CommonInfo one3 = commonInfoService.findOne(12); - String name = one3.getValue(); - PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo()); - if (payDetails1 == null) { - PayDetails payDetails = new PayDetails(); - payDetails.setState(0); - payDetails.setCreateTime(sdf.format(new Date())); - payDetails.setOrderId(orders.getOrdersNo()); - payDetails.setUserId(orders.getUserId()); - if (orders.getUserPackageDetailId() != null) { - payDetails.setMoney(orders.getTaxiMoney().doubleValue()); - } else { - payDetails.setMoney(orders.getPayMoney().doubleValue()); - } - payDetails.setClassify(6); - payDetails.setType(1); - payDetailsDao.insert(payDetails); + //通知页面地址 + CommonInfo one = commonInfoService.findOne(19); + String returnUrl = one.getValue() + "/#/pages/task/recharge"; + CommonInfo one3 = commonInfoService.findOne(12); + String name = one3.getValue(); + PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo()); + if (payDetails1 == null) { + PayDetails payDetails = new PayDetails(); + payDetails.setState(0); + payDetails.setCreateTime(sdf.format(new Date())); + payDetails.setOrderId(orders.getOrdersNo()); + payDetails.setUserId(orders.getUserId()); + if (orders.getUserPackageDetailId() != null) { + payDetails.setMoney(orders.getTaxiMoney().doubleValue()); } else { - payDetails1.setClassify(6); - payDetailsDao.updateById(payDetails1); + payDetails.setMoney(orders.getPayMoney().doubleValue()); } + payDetails.setClassify(6); + payDetails.setType(1); + payDetailsDao.insert(payDetails); + } else { + payDetails1.setClassify(6); + payDetailsDao.updateById(payDetails1); + } // if (type == 1) { // if(orders.getUserPackageDetailId() !=null ){ // return payApp(name, orders.getOrdersNo(), orders.getTaxiMoney().doubleValue()); @@ -1442,7 +1438,6 @@ public class AliPayController { // } // } payOrderResult(orders.getOrdersNo()); - } return Result.success(); } 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 fa2a1fd..bd08a2d 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 @@ -644,36 +644,32 @@ public class WxServiceImpl implements WxService { } } - String isTravelFree = commonInfoService.findOne(460).getValue(); - if(isTravelFree.equals("是")){ - payPackageOrderResult(orders.getOrdersNo(),classify); - }else { - PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo()); - if (payDetails1 == null) { - PayDetails payDetails = new PayDetails(); - payDetails.setState(0); - payDetails.setCreateTime(sdf.format(new Date())); - payDetails.setOrderId(orders.getOrdersNo()); - payDetails.setUserId(orders.getUserId()); - if (orders.getUserPackageDetailId() != null) { - payDetails.setMoney(orders.getTaxiMoney().doubleValue()); - } else { - payDetails.setMoney(orders.getPayMoney().doubleValue()); - } - payDetails.setClassify(classify); - payDetails.setType(1); - payDetailsDao.insert(payDetails); + PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo()); + if (payDetails1 == null) { + PayDetails payDetails = new PayDetails(); + payDetails.setState(0); + payDetails.setCreateTime(sdf.format(new Date())); + payDetails.setOrderId(orders.getOrdersNo()); + payDetails.setUserId(orders.getUserId()); + if (orders.getUserPackageDetailId() != null) { + payDetails.setMoney(orders.getTaxiMoney().doubleValue()); } else { - payDetails1.setClassify(classify); - payDetailsDao.updateById(payDetails1); + payDetails.setMoney(orders.getPayMoney().doubleValue()); } + payDetails.setClassify(classify); + payDetails.setType(1); + payDetailsDao.insert(payDetails); + } else { + payDetails1.setClassify(classify); + payDetailsDao.updateById(payDetails1); + } // if(orders.getUserPackageDetailId() !=null ){ // return pay(orders.getTaxiMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request); // }else{ // return pay(orders.getPayMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request); // } - payOrderResult(orders.getOrdersNo()); - } + payOrderResult(orders.getOrdersNo()); + return Result.success(); }