From 0867ea81d6b97e5f7d71dc0318e3fd84b64bdb54 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 15 四月 2026 22:33:31 +0800
Subject: [PATCH] 支付对接
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 7ee30a4..9e08da5 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -154,7 +154,7 @@
@Override
public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
OrderTaxi orderTaxi = this.selectById(orderId);
- if(null != orderTaxi && orderTaxi.getType() == 2){
+ if(null != orderTaxi ){
if(orderTaxi.getState() != 1){
return ResultUtil.error("订单已被抢了");
}
@@ -691,19 +691,19 @@
orderTaxi.setPrepayStage(5);
orderTaxi.setPayMoney(formatMoney(orderTaxi.getOrderMoney()));
- if (orderTaxi.getRecoveryOrder() == null || orderTaxi.getRecoveryOrder() == 0) {
- Double orderMoney = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus()
- ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
- Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderMoney);
- orderTaxi.setSplitAllocation(JSON.toJSONString(map));
- }
-
- if (2 == orderTaxi.getAbnormal() && 1 == orderTaxi.getAbnormalStatus()) {
- orderTaxi.setAbnormalStatus(3);
- orderTaxi.setResponsibilityMoney(new BigDecimal(orderTaxi.getOrderMoney()));
- orderTaxi.setResponsibilityType(3);
- orderTaxi.setAbnormalRemark("乘客已完成预支付订单结算，申诉已自动关闭");
- }
+// if (orderTaxi.getRecoveryOrder() == null || orderTaxi.getRecoveryOrder() == 0) {
+// Double orderMoney = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus()
+// ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
+// Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderMoney);
+// orderTaxi.setSplitAllocation(JSON.toJSONString(map));
+// }
+//
+// if (2 == orderTaxi.getAbnormal() && 1 == orderTaxi.getAbnormalStatus()) {
+// orderTaxi.setAbnormalStatus(3);
+// orderTaxi.setResponsibilityMoney(new BigDecimal(orderTaxi.getOrderMoney()));
+// orderTaxi.setResponsibilityType(3);
+// orderTaxi.setAbnormalRemark("乘客已完成预支付订单结算，申诉已自动关闭");
+// }
}
private String buildPrepayRefundNo(Integer orderType, Integer orderId) {
--
Gitblit v1.7.1