liujie
5 天以前 c0f81ab1688236eeeb2ab90460b76676e23de7b8
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -15,10 +15,7 @@
import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
import com.stylefeng.guns.modular.system.dao.SysIntegralMapper;
import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
@@ -149,9 +146,9 @@
   
   @Autowired
   private IDriverServiceService driverServiceService;
   @Autowired
   private GDFalconUtil gdFalconUtil;
   private TAbnormalPayOrderMapper abnormalPayOrderMapper;
   
   @Autowired
   private IOrderPrivateCarService orderPrivateCarService;
@@ -2313,7 +2310,7 @@
   public void promotion(Integer orderId) {
      OrderTaxi orderTaxi = this.baseMapper.selectById(orderId);
      UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
      if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
      if(orderTaxi.getPromotionDriverId()!=null){
         String registAreaCode = userInfo.getRegistAreaCode();
         TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 2 + ", bizType) limit 1"));
         if(tDriverPromotionActivity!=null){
@@ -2324,5 +2321,14 @@
            this.baseMapper.updateById(orderTaxi);
         }
      }
      // 是否异常订单
      if (orderTaxi.getResponsibilityType() !=null && orderTaxi.getResponsibilityType() >2) {
         TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum", orderTaxi.getOrderNum())).stream().findFirst().orElse(null);
         if (tAbnormalPayOrder != null) {
            tAbnormalPayOrder.setPayStatus(2);
            tAbnormalPayOrder.setPayTime(new Date());
            abnormalPayOrderMapper.updateById(tAbnormalPayOrder);
         }
      }
   }
}