From a50197bd1a429d903718e40b54685bb2a241bd4a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 一月 2025 19:37:20 +0800
Subject: [PATCH] 修改
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 4e0f46b..7041973 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -751,12 +751,15 @@
appletsOpenId = userInfo.getAppletsOpenId();
}
Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",2", 9, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/wxPayOrderTaxi", "", type, appletsOpenId);
- if(map.get("code").equals("200")){
- paymentRecordService.saveData(1, orderTaxi.getUserId(), 1, orderId, 2, 1, orderMoney, map.get("order_id"), 1);//添加预支付数据
- resultUtil = ResultUtil.success(map.get("data"));
- }else{
- resultUtil = ResultUtil.error(map.get("msg"), "");
- }
+ String app = type == 1 ? "APP" : "JSAPI";
+ resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_2_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
+ paymentRecordService.saveData(1, orderTaxi.getUserId(), 1, orderId, 2, 1, orderMoney, "", 1);//添加预支付数据
+// if(map.get("code").equals("200")){
+// paymentRecordService.saveData(1, orderTaxi.getUserId(), 1, orderId, 2, 1, orderMoney, map.get("order_id"), 1);//添加预支付数据
+// resultUtil = ResultUtil.success(map.get("data"));
+// }else{
+// resultUtil = ResultUtil.error(map.get("msg"), "");
+// }
}
if(payType == 2){//支付宝支付
Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",2", 10, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/aliPayOrderTaxi", "", type, null);
@@ -1387,20 +1390,15 @@
@Override
public void run() {
try {
- System.out.println("进入订单推送111111111111");
orderIds.add(orderTaxi.getId());//添加记录，防止调用接口重复提醒无人接单
String vehicle = redisUtil.getValue("VEHICLE");
List<Integer> integers = new ArrayList<>();
if(ToolUtil.isNotEmpty(vehicle)){
integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
}
- System.out.println("进入订单推送22222222222222=========="+integers);
Company query = companyCityService.query(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司
- System.out.println("进入订单推送=========3==========="+query);
List<PushOrder> querys = pushOrderService.querys(null, 2, query.getId());//获取需要推送的次数
- System.out.println("进入订单推送=========4==========="+querys);
for(int i = 1; i <= querys.size(); i++){
- System.out.println("进入订单推送");
PushOrder pushOrder = pushOrderService.querys(i, 2, query.getId()).get(0);
System.out.println("进入订单推送");
//获取空闲司机
@@ -1409,11 +1407,8 @@
if(list.size() > 0){
System.out.println("进入司机推送");
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
- System.out.println("推送占比计算成小数======="+driverProportion);
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
- System.out.println("计算占比转成整数======="+lastIndex);
list = list.subList(0, lastIndex);//获取空闲司机中占比数据
- System.out.println("获取空闲司机中占比数据======="+list);
for(Driver driver : list){//开始进行推送
System.out.println("开始进行推送======="+driver);
//查询是否在限制推单范围内
@@ -1427,7 +1422,6 @@
if(bo){
continue;
}
- System.out.println("推送订单前");
pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
System.out.println("推送订单后");
}
--
Gitblit v1.7.1