From b5ff50145e846637838a7905610aed3f4ada5e72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 00:08:51 +0800
Subject: [PATCH] 更新部分支付功能逻辑
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index ae11f11..5abfdda 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -123,9 +123,6 @@
private IPaymentRecordService paymentRecordService;
@Autowired
- private PayMoneyUtil payMoneyUtil;
-
- @Autowired
private ITransactionDetailsService transactionDetailsService;
@Autowired
@@ -150,15 +147,6 @@
private RedisUtil redisUtil;
@Autowired
- private GDFalconUtil gdFalconUtil;
-
- @Autowired
- private GDMapGeocodingUtil gdMapGeocodingUtil;
-
- @Autowired
- private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
- @Autowired
private IOrderPositionService orderPositionService;
@Autowired
@@ -166,9 +154,6 @@
@Autowired
private IAssignOrderService assignOrderService;
-
- @Autowired
- private ALiSendSms aLiSendSms;
@Resource
private CarMapper carMapper;
@@ -178,6 +163,9 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
+
+ @Autowired
+ private IBankCardService bankCardService;
@Value("${filePath}")
@@ -814,7 +802,7 @@
}
@Override
- public ResultUtil payPrivateCarOrder(Integer payType, String accountNumber, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
+ public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
return ResultUtil.error("订单已完成支付，不允许重复支付");
@@ -904,14 +892,15 @@
}
if(payType == 2){//银行卡支付
+ BankCard bankCard = bankCardService.selectById(bankCardId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String merchantTransactionId = sdf.format(new Date()) + "1" + language + orderId;
CheckoutRequest checkoutRequest = new CheckoutRequest();
- checkoutRequest.setMsisdn(Long.valueOf(accountNumber));
+ checkoutRequest.setMsisdn(Long.valueOf(bankCard.getCode()));
checkoutRequest.setCustomerEmail(userInfo.getEmail());
- checkoutRequest.setAccountNumber(accountNumber);
- checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
- checkoutRequest.setCustomerLastName(userInfo.getLastName());
+ checkoutRequest.setAccountNumber(bankCard.getCode());
+ checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
+ checkoutRequest.setCustomerLastName(bankCard.getLastName());
checkoutRequest.setRequestAmount(orderMoney);
checkoutRequest.setMerchantTransactionId(merchantTransactionId);
checkoutRequest.setRequestDescription("Travel completion payment");
--
Gitblit v1.7.1