From 0efb002d79eda0b1ef539cf8a029f14b5395f83e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 八月 2025 15:01:28 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 9313da3..cc777a1 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -562,8 +562,8 @@
return ResultUtil.error("请先配置价格规则");
}
Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId(), systemPriceCity.getId());
- System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
- System.out.println("query1:" + query1);
+// System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
+// System.out.println("query1:" + query1);
//开始根据不同的方式计算金额
if (query1 != null) {
JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());//等待费
@@ -2156,27 +2156,20 @@
if("1".equals(data.getStatus())){
return "error";
}
- String partnerPayId = data.getPartnerPayId();
+ String orderNo = data.getOrderNo();
String payId = data.getPayId();
//网约车
- if(partnerPayId.contains("PR")){
- partnerPayId = partnerPayId.substring(2);
- orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(partnerPayId), payId, 1);
-
-
- orderPrivateCarService.promotion(Integer.valueOf(partnerPayId));
+ if(orderNo.contains("PR")){
+ orderNo = orderNo.substring(2);
+ orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(orderNo), payId, 1);
+ orderPrivateCarService.promotion(Integer.valueOf(orderNo));
}
//出租车
- if(partnerPayId.contains("TA")){
- partnerPayId = partnerPayId.substring(2);
- orderTaxiService.payOrderTaxiCallback(Integer.valueOf(partnerPayId), payId, 1, 0);
-
- orderTaxiService.promotion(Integer.valueOf(partnerPayId));
+ if(orderNo.contains("TA")){
+ orderNo = orderNo.substring(2);
+ orderTaxiService.payOrderTaxiCallback(Integer.valueOf(orderNo), payId, 1, 0);
+ orderTaxiService.promotion(Integer.valueOf(orderNo));
}
-
-
-
-
}catch (Exception e){
e.printStackTrace();
return "error";
--
Gitblit v1.7.1