From 1910d031dbe03858a9b902e37c4e48c95e8b058b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 11 八月 2025 19:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 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 748b610..bf4209e 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
@@ -9,6 +9,8 @@
import com.stylefeng.guns.modular.call.server.IOrderCallService;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
+import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
+import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
@@ -25,6 +27,7 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallbackData;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
@@ -162,7 +165,9 @@
@Autowired
private IServerCarModelService serverCarModelService;
-
+
+ @Autowired
+ private IOrderRideService orderRideService;
@@ -243,7 +248,7 @@
@PostMapping("/api/order/queryMyOrderList")
@ApiOperation(value = "获取个人中心订单列表", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流， 5=跨城小件物流，6=包车，7=助老模式）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流， 5=跨城小件物流，6=包车，7=助老模式，8顺风车）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "页码（首页1）", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -276,6 +281,9 @@
break;
case 7:
// list = orderCallService.queryMyOrderList(uid, pageNum, size);
+ break;
+ case 8:
+ list = orderRideService.queryMyOrderList(uid, pageNum, size);
break;
}
return ResultUtil.success(OrderWarpper.getOrderWarpper(list));
@@ -520,7 +528,7 @@
}
orderList = orderPrivateCarService.queryOrderInfo2(orderId, 6, null, null);
if (orderInfoWarpper.getState() > 1 && orderInfoWarpper.getDriverId() != 0) {
- String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
+ String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
if (value == null || value.equals("")) {
if (orderList.isEmpty()) {
orderList = orderPrivateCarService.queryOrderInfo2(orderId, 5, "0", "0");
@@ -561,8 +569,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());//等待费
@@ -1415,7 +1423,11 @@
case 2:
return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip);
case 3:
- return orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
+ ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
+
+ orderCrossCityService.promotion(orderId);
+
+ return resultUtil;
case 4:
return orderLogisticsService.payLogisticsOrder1(payType, orderId, objectId, objectType, type);
case 5:
@@ -2143,7 +2155,30 @@
@PostMapping("/base/order/qytPaymentCallback")
public String qytPaymentCallback(@RequestBody QYTPaymentCallback qytPaymentCallback) {
log.info("【黔云通支付回调通知】请求参数:" + JSON.toJSONString(qytPaymentCallback));
- if (null == qytPaymentCallback) {
+ try {
+ if (null == qytPaymentCallback) {
+ return "error";
+ }
+ QYTPaymentCallbackData data = qytPaymentCallback.getData();
+ if("1".equals(data.getStatus())){
+ return "error";
+ }
+ String orderNo = data.getOrderNo();
+ String payId = data.getPayId();
+ //网约车
+ if(orderNo.contains("PR")){
+ orderNo = orderNo.substring(2);
+ orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(orderNo), payId, 1);
+ orderPrivateCarService.promotion(Integer.valueOf(orderNo));
+ }
+ //出租车
+ 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";
}
return "success";
@@ -2158,12 +2193,6 @@
*/
private void promotion(Integer orderType, Integer orderId) {
switch (orderType) {
- case 1:
- orderPrivateCarService.promotion(orderId);
- break;
- case 2:
- orderTaxiService.promotion(orderId);
- break;
case 3:
orderCrossCityService.promotion(orderId);
break;
--
Gitblit v1.7.1