From f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 八月 2025 23:53:05 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 321 +++++++++++++++++++++++++++++++----------------------
1 files changed, 189 insertions(+), 132 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d34c2b8..47cd81d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -603,16 +603,6 @@
orderPrivateCar.setIsReassign(1);
orderPrivateCar.setIsDelete(1);
- // 是否推广订单
- Integer promotion = isPromotion(uid);
- if(promotion!=null){
- orderPrivateCar.setPromotion(2);
- Driver driver = driverService.selectById(promotion);
- orderPrivateCar.setPromotionUser(driver.getName());
- orderPrivateCar.setPromotionPhone(driver.getPhone());
- orderPrivateCar.setPromotionDriverId(promotion);
- }
-
//判断独享，一口价，拼车
JSONArray jsonArray = JSON.parseArray(serverCarModel);
this.insert(orderPrivateCar);
@@ -701,10 +691,10 @@
orderPrivateCar.setIsDelete(1);
orderPrivateCar.setPid(orderPrivateCar1.getPid() == null ? orderPrivateCar1.getId() : orderPrivateCar1.getPid());
- Integer promotion1 = isPromotion(orderPrivateCar.getUserId());
+ Integer promotion1 = isPromotion(orderPrivateCar.getUserId(), driver.getPlaceOfEmployment());
if(promotion1!=null){
orderPrivateCar.setPromotion(2);
- Driver driver1 = driverService.selectById(promotion);
+ Driver driver1 = driverService.selectById(promotion1);
orderPrivateCar.setPromotionUser(driver1.getName());
orderPrivateCar.setPromotionPhone(driver1.getPhone());
orderPrivateCar.setPromotionDriverId(promotion1);
@@ -760,7 +750,6 @@
//添加消息
systemNoticeService.addSystemNotice(1, "您的快车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
-
baseWarpper.setId(orderPrivateCar.getId());
} catch (Exception e) {
e.printStackTrace();
@@ -774,11 +763,11 @@
}
- private Integer isPromotion(Integer userId){
+ private Integer isPromotion(Integer userId, String code){
UserInfo userInfo = userInfoService.selectById(userId);
- if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
- String registAreaCode = userInfo.getRegistAreaCode();
- TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).eq("state",1).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
+ if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()>=System.currentTimeMillis()){
+ TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", code)
+ .eq("state",1).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
if(tDriverPromotionActivity!=null){
return userInfo.getBindDriverId();
}
@@ -939,6 +928,15 @@
if (null == orderPrivateCar) {
return ResultUtil.error("获取数据失败，订单信息有误");
}
+ if (orderPrivateCar.getState() == 5) {
+ return ResultUtil.error("订单已开始服务，不能取消订单");
+ }
+ if (orderPrivateCar.getState() == 6 || orderPrivateCar.getState() == 7 || orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9) {
+ return ResultUtil.error("订单已完成，不能取消订单");
+ }
+ if (orderPrivateCar.getState() == 10) {
+ return ResultUtil.error("订单已被取消，不能重复操作");
+ }
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
double amount = 0;
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, openCity.getId());
@@ -1026,23 +1024,25 @@
}
this.deleteTask(id);//删除定时任务
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar.getTravelId());
- request.setStatus(orderPrivateCar.getState());
- if (null != orderPrivateCar.getDriverId()) {
- driver1 = driverService.selectById(orderPrivateCar.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ if(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
+ Driver driver1 = null;
+ Company company = null;
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
+ request.setOrderId(orderPrivateCar.getTravelId());
+ request.setStatus(orderPrivateCar.getState());
+ if (null != orderPrivateCar.getDriverId()) {
+ driver1 = driverService.selectById(orderPrivateCar.getDriverId());
+ company = companyService.selectById(driver1.getCompanyId());
+ request.setDriverId(driver1.getEmpId().toString());
+ request.setSupplierShopId(company.getEnterCode());
+ }
+ if (2 == orderPrivateCar.getPromotion()) {
+ Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver2.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request);
}
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
new Thread(new Runnable() {
@Override
@@ -1161,23 +1161,25 @@
orderPrivateCar.setBindId("");
this.updateById(orderPrivateCar);
- Driver driver = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar.getTravelId());
- request.setStatus(orderPrivateCar.getState());
- if (null != orderPrivateCar.getDriverId()) {
- driver = driverService.selectById(orderPrivateCar.getDriverId());
- company = companyService.selectById(driver.getCompanyId());
- request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ if(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
+ Driver driver = null;
+ Company company = null;
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
+ request.setOrderId(orderPrivateCar.getTravelId());
+ request.setStatus(orderPrivateCar.getState());
+ if (null != orderPrivateCar.getDriverId()) {
+ driver = driverService.selectById(orderPrivateCar.getDriverId());
+ company = companyService.selectById(driver.getCompanyId());
+ request.setDriverId(driver.getEmpId().toString());
+ request.setSupplierShopId(company.getEnterCode());
+ }
+ if (2 == orderPrivateCar.getPromotion()) {
+ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request);
}
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver1.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
orderCancel.setState(2);
orderCancel.setPayType(3);
@@ -1924,6 +1926,7 @@
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(3);
orderPrivateCar.setPayMoney(orderMoney);
+ orderPrivateCar.setPayTime(new Date());
//处理优惠券和红包
if (null != userCouponRecord) {
@@ -1936,9 +1939,13 @@
query.setEndTime(new Date());
userRedPacketRecordService.updateById(query);
}
- //添加收入
- Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderPrivateCar.getOrderMoney());
- orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
+ //非追缴单才需要添加收入
+ if(0 == orderPrivateCar.getRecoveryOrder()){
+ //添加收入
+ Double orderMoney1 = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
+ Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderMoney1);
+ orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
+ }
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -1976,7 +1983,7 @@
return ResultUtil.error("订单不在待支付状态，不允许支付", new ArrayList<>());
}
Integer uid = orderPrivateCar.getUserId();
- Double orderMoney = orderPrivateCar.getOrderMoney();
+ Double orderMoney = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
UserInfo userInfo = userInfoService.selectById(uid);
ResultUtil resultUtil = ResultUtil.success(new Object());
orderPrivateCar.setCouponMoney(0D);//初始化历史数据
@@ -2146,8 +2153,41 @@
}
// String app = type == 1 ? "APP" : "JSAPI";
// resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_1_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
-
+ //如果没有创建行程，需要先创建行程单
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+ if(ToolUtil.isEmpty(orderPrivateCar.getTravelId())){
+ Company company = companyService.selectById(driver.getCompanyId());
+ //调三方订单中心创建行程单
+ CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
+ request.setOrderNo("PR" + orderPrivateCar.getId());
+ request.setCustomerId(userInfo.getOnconUUID());
+ request.setDriverId(driver.getEmpId().toString());
+ request.setSupplierShopId(company.getEnterCode());
+ if(orderPrivateCar.getPromotion() !=null && 2 == orderPrivateCar.getPromotion()){
+ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ request.setServiceType(2);
+ String travelItinerary = OrderUtil.createTravelItinerary(request);
+ orderPrivateCar.setTravelId(travelItinerary);
+
+ //创建订单
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
+ request1.setOrderId(orderPrivateCar.getTravelId());
+ request1.setStatus(orderPrivateCar.getState());
+ if (null != orderPrivateCar.getDriverId()) {
+ request1.setDriverId(driver.getEmpId().toString());
+ request1.setSupplierShopId(company.getEnterCode());
+ }
+ if (2 == orderPrivateCar.getPromotion()) {
+ Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request1.setPromoterId(driver2.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request1);
+ }
+
+
if(null == orderPrivateCar.getIsCreated() || 0 == orderPrivateCar.getIsCreated()){
//调用中台创建订单及拉起支付接口
TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData();
@@ -2167,7 +2207,7 @@
tradeOrderCreateData.setOrderDesc("完成订单");
tradeOrderCreateData.setRetUrl(path);
tradeOrderCreateData.setClientIp(ip);
-
+
List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
@@ -2178,7 +2218,7 @@
}
goodsInfo.add(goodsInfoRequest);
tradeOrderCreateData.setGoodsInfo(goodsInfo);
- TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData);
+ TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData, orderPrivateCar.getRecoveryOrder());
PayInfo payInfo = tradeOrderCreate.getPayInfo();
if(!"000000".equals(payInfo.getRetCode())){
return ResultUtil.error(payInfo.getRetMsg());
@@ -2203,7 +2243,7 @@
}
goodsInfo.add(goodsInfoRequest);
tradePayOff1Data.setGoodsInfo(goodsInfo);
- PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data);
+ PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data, orderPrivateCar.getRecoveryOrder());
if(!"000000".equals(payInfo.getRetCode())){
return ResultUtil.error(payInfo.getRetMsg());
}
@@ -2275,6 +2315,7 @@
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(3);
+ orderPrivateCar.setPayTime(new Date());
//处理优惠券和红包
if (null != userCouponRecord) {
@@ -2291,10 +2332,13 @@
query.setEndTime(new Date());
userRedPacketRecordService.updateById(query);
}
-
- //添加收入
- Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderPrivateCar.getOrderMoney());
- orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
+ //非追缴单才添加收入记录
+ if(0 == orderPrivateCar.getRecoveryOrder()){
+ //添加收入
+ Double orderMoney1 = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
+ Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderMoney1);
+ orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
+ }
this.updateAllColumnById(orderPrivateCar);
@@ -2324,6 +2368,7 @@
if (orderMoney == 0) {
return ResultUtil.error("请使用余额支付");
}
+ orderPrivateCar.setPayTime(new Date());
Integer integer = paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 4, orderMoney, "", 1);
resultUtil = appOrderController.placeAnOrder(new BigDecimal(orderMoney), 4, orderId, 6, integer);
@@ -2441,23 +2486,25 @@
orderPrivateCar.setTelX("");
this.updateById(orderPrivateCar);
- Driver driver = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar.getTravelId());
- request.setStatus(orderPrivateCar.getState());
- if (null != orderPrivateCar.getDriverId()) {
- driver = driverService.selectById(orderPrivateCar.getDriverId());
- company = companyService.selectById(driver.getCompanyId());
- request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ if(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
+ Driver driver = null;
+ Company company = null;
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
+ request.setOrderId(orderPrivateCar.getTravelId());
+ request.setStatus(orderPrivateCar.getState());
+ if (null != orderPrivateCar.getDriverId()) {
+ driver = driverService.selectById(orderPrivateCar.getDriverId());
+ company = companyService.selectById(driver.getCompanyId());
+ request.setDriverId(driver.getEmpId().toString());
+ request.setSupplierShopId(company.getEnterCode());
+ }
+ if (2 == orderPrivateCar.getPromotion()) {
+ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request);
}
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver1.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
query.setState(2);
query.setCode(order_id);
@@ -2499,6 +2546,7 @@
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(type);
orderPrivateCar.setPayMoney(query.getAmount());
+ orderPrivateCar.setPayTime(new Date());
UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
@@ -2533,11 +2581,16 @@
query.setState(2);
query.setCode(order_id);
paymentRecordService.updateById(query);
-
- //添加收入
- Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderPrivateCar.getOrderMoney());
- orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
+
+ //非追缴单才需要记录收入
+ if(0 == orderPrivateCar.getRecoveryOrder()){
+ //添加收入
+ Double orderMoney = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
+ Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderMoney);
+ orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
+ }
this.updateById(orderPrivateCar);
+ promotion(orderPrivateCar.getId());
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -2779,52 +2832,66 @@
OpenCity openCity = openCityService.openCity1(startLon.toString(), startLat.toString());
List<PushOrder> querys = pushOrderService.querys(null, 1, openCity.getId());//获取需要推送的次数
//整轮派单结束，若无司机接单，系统自动增加派单5轮，若增加5轮后任无司机接单，则系统结束派单，乘客端显示无司机接单、是否再次打车
- for (int i = 1; i <= querys.size() + 15; i++) {
- OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(id);
- if (null == orderPrivateCar || orderPrivateCar.getState() > 1) {
- break;
- }
- int finalI = i;
- PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
- System.out.println("pushOrder:" + pushOrder);
- if (orderPrivateCar.getState() > 1) {
- break;
- }
- //获取空闲司机
- List<Driver> list = driverService.queryIdleDriver(orderType, serverCarModelId, startLon, startLat, pushOrder.getPushDistance(), null);//所有附近空闲司机
- if (list.size() > 0) {
- double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
- int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
- lastIndex = lastIndex == 0 ? list.size() : lastIndex;
- list = list.subList(0, lastIndex);//获取空闲司机中占比数据
- for (Driver driver : list) {//开始进行推送
- boolean bo = false;
- for (Integer integer : integers) {
- if (integer.compareTo(driver.getId()) == 0) {
- bo = true;
- break;
+ int num = 0;
+ for (int j = 0; j < 6; j++) {
+ Boolean push = false;
+ for (int i = 1; i <= querys.size(); i++) {
+ num++;
+ OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(id);
+ if (null == orderPrivateCar || orderPrivateCar.getState() > 1) {
+ push = true;
+ break;
+ }
+ int finalI = i;
+ PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
+ System.out.println("pushOrder:" + pushOrder);
+ if (orderPrivateCar.getState() > 1) {
+ push = true;
+ break;
+ }
+ //获取空闲司机
+ List<Driver> list = driverService.queryIdleDriver(orderType, serverCarModelId, startLon, startLat, pushOrder.getPushDistance(), null);//所有附近空闲司机
+ //随机排序
+ Collections.shuffle(list);
+ if (list.size() > 0) {
+ double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
+ int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
+ lastIndex = lastIndex == 0 ? list.size() : lastIndex;
+ list = list.subList(0, lastIndex);//获取空闲司机中占比数据
+ for (Driver driver : list) {//开始进行推送
+ boolean bo = false;
+ for (Integer integer : integers) {
+ if (integer.compareTo(driver.getId()) == 0) {
+ bo = true;
+ break;
+ }
}
+ if (bo) {
+ continue;
+ }
+ pushUtil.pushOrderState(2, driver.getId(), id, 1, 1, pushOrder.getPushTime());
}
- if (bo) {
- continue;
- }
- pushUtil.pushOrderState(2, driver.getId(), id, 1, 1, pushOrder.getPushTime());
+ }
+ Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
+ OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
+ Integer state =orderPrivateCar1.getState();
+ if (state > 1) {
+ orderIds.remove(orderPrivateCar.getId());
+ push = true;
+ break;
+ }
+ if (num == 18) {
+ orderPrivateCar1.setState(10);
+ orderPrivateCarMapper.updateById(orderPrivateCar1);
+ pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 1);
+ orderIds.remove(orderPrivateCar.getId());
}
}
- Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
- OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
- Integer state =orderPrivateCar1.getState();
- if (state > 1) {
- orderIds.remove(orderPrivateCar.getId());
+ if(push){
break;
}
- if (i == querys.size() + 15) {
- orderPrivateCar1.setState(10);
- orderPrivateCarMapper.updateById(orderPrivateCar1);
- pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
- orderIds.remove(orderPrivateCar.getId());
- }
}
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -2897,7 +2964,7 @@
return;
}
if (i == querys.size() + 15 && state == 1) {
- pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
+ pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 1);
orderIds.remove(orderPrivateCar.getId());
}
}
@@ -2933,7 +3000,7 @@
// 开始绑定的 后面到期也结算
System.out.println("eeeee+"+orderPrivateCar.getPromotionDriverId());
if(orderPrivateCar.getPromotionDriverId()!=null ){
- String registAreaCode = userInfo.getRegistAreaCode();
+ String registAreaCode = driverService.selectById(orderPrivateCar.getPromotionDriverId()).getPlaceOfEmployment();
TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
System.out.println("ddddd"+tDriverPromotionActivity);
if(tDriverPromotionActivity!=null){
@@ -2946,16 +3013,6 @@
orderPrivateCar.setPromotionActivityId(tDriverPromotionActivity.getId());
orderPrivateCar.setSuccessTime(new Date());
this.baseMapper.updateById(orderPrivateCar);
- }
- }
-
- // 是否异常订单
- if (orderPrivateCar.getResponsibilityType() !=null && orderPrivateCar.getResponsibilityType() >2) {
- TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", orderPrivateCar.getOrderNum())).stream().findFirst().orElse(null);
- if (tAbnormalPayOrder != null) {
- tAbnormalPayOrder.setPayStatus(2);
- tAbnormalPayOrder.setPayTime(new Date());
- abnormalPayOrderMapper.updateById(tAbnormalPayOrder);
}
}
}
--
Gitblit v1.7.1