添加时间

liujie

5 天以前 88141ff7e83f44feb56f8cbcaaf84260d0626883

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -771,7 +771,7 @@
      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).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
         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(tDriverPromotionActivity!=null){
            return userInfo.getBindDriverId();
         }
@@ -2348,7 +2348,12 @@
         //添加收入
         Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderPrivateCar.getOrderMoney());
         orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
			


         this.updateAllColumnById(orderPrivateCar);
         promotion(orderPrivateCar.getId());


         // TODO: 2020/5/24 这里需要给司机和用户推送订单状态
         new Thread(new Runnable() {
            @Override
@@ -2376,8 +2381,12 @@
         resultUtil = appOrderController.placeAnOrder(new BigDecimal(orderMoney), 4, orderId, 6, integer);
         
      }
		
      this.updateAllColumnById(orderPrivateCar);

      if(payType != 3){
         this.updateAllColumnById(orderPrivateCar);
      }


      return resultUtil;
   }
   
@@ -2972,15 +2981,20 @@
      UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
//      if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
      // 开始绑定的  后面到期也结算
      System.out.println("eeeee+"+orderPrivateCar.getPromotionDriverId());
      if(orderPrivateCar.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(" + 1 + ", bizType) limit 1"));
         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){
            Double payMoney = orderPrivateCar.getPayMoney();
            System.out.println(payMoney);
            BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
            System.out.println(bigDecimal);
            orderPrivateCar.setPromotionDriverId(userInfo.getBindDriverId());
            orderPrivateCar.setPromotionMoney(bigDecimal);
            orderPrivateCar.setPromotionActivityId(tDriverPromotionActivity.getId());
            orderPrivateCar.setSuccessTime(new Date());
            this.baseMapper.updateById(orderPrivateCar);
         }
      }