DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -20,12 +20,10 @@ import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper; import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper; import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; import com.stylefeng.guns.modular.system.dao.PhoneMapper; import com.stylefeng.guns.modular.system.dao.RegionMapper; import com.stylefeng.guns.modular.system.dao.SysIntegralMapper; import com.stylefeng.guns.modular.system.dao.UserInfoMapper; import com.stylefeng.guns.modular.system.dao.*; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.service.impl.CarServiceImpl; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.warpper.BaseWarpper; import com.stylefeng.guns.modular.system.warpper.MerchantCouponListWarpper; @@ -160,6 +158,10 @@ @Value("${callbackPath}") private String callbackPath; @Autowired private CarModelMapper carModelMapper; @Autowired private CarServiceImpl carServiceImpl; /** @@ -296,7 +298,13 @@ //还原座位数 LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); if(1 == orderCrossCity.getTravelMode()){ lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); }else{ Car car = carServiceImpl.selectById(driver.getCarId()); CarModel carModel = carModelMapper.selectById(car.getCarModelId()); lineShiftDriver.setLaveSeat(carModel.getSeat() - 1); } lineShiftDriver.setLaveSeatNumber( (ToolUtil.isNotEmpty(lineShiftDriver.getLaveSeatNumber()) ? lineShiftDriver.getLaveSeatNumber() + "," : "") + orderCrossCity.getSeatNumber() @@ -305,7 +313,7 @@ //修改司机空闲状态 List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryWithin30Minutes(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11); if(orderCrossCities.size() == 0){ if(orderCrossCities.size() <= 1){ driver = driverService.selectById(orderCrossCity.getDriverId()); driver.setState(2); driverService.updateById(driver); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -586,7 +586,7 @@ * @return */ public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) { getPaymentInfoDataRequest.setPartnerId("5400004"); getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004"); GetPaymentInfoRequest request = new GetPaymentInfoRequest(); request.setRequstType("POST"); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -144,23 +144,27 @@ */ @Override public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception { OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId); if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){ return ResultUtil.error("订单已被抢了"); } OrderTaxi orderTaxi = null; if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1|| orderPrivateCar1.getState() == 11)){ orderPrivateCarService.deleteById(orderId); OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1); this.insert(orderTaxi1); orderTaxi = orderTaxi1; OrderTaxi orderTaxi = this.selectById(orderId); if(null != orderTaxi && orderTaxi.getType() == 2){ if(orderTaxi.getState() != 1){ return ResultUtil.error("订单已被抢了"); } }else{ orderTaxi = this.selectById(orderId); OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId); if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){ return ResultUtil.error("订单已被抢了"); } orderTaxi = null; if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1|| orderPrivateCar1.getState() == 11)){ orderPrivateCarService.deleteById(orderId); OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1); this.insert(orderTaxi1); orderTaxi = orderTaxi1; } } if(null == orderTaxi){ return ResultUtil.error("订单已被抢了"); } //处理摆渡车的情况 if(orderTaxi.getType() == 2){ DriverQYTTravel/guns-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/etraffic/server/logs/driver"/> <property name="log.path" value="/etraffic/server/chuxing/logs/driver"/> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 -->
