未接单取消

liujie

5 天以前 2f2b4c7ed80ee5132718523e0c7e7e2956aaf27d

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

@@ -398,7 +398,7 @@
                        JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
                        //判断时间
                        if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) {
                           String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(order.getDriverId()));
                           String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(order.getDriverId()));
                           //                            Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1).get("distance").toString());
                           //                            Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString());
                           
@@ -668,7 +668,7 @@
                           JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
                           //判断时间
                           if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) {
                              String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(order.getDriverId()));
                              String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(order.getDriverId()));
                              //                            Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1).get("distance").toString());
                              //                            Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString());
                              
@@ -718,7 +718,16 @@
                     String travelItinerary = OrderUtil.createTravelItinerary(request);
                     orderPrivateCar.setTravelId(travelItinerary);

                     Integer promotion1 = isPromotion(orderPrivateCar.getUserId());
                     if(promotion1!=null){
                        orderPrivateCar.setPromotion(2);
                        Driver driver1 = driverService.selectById(promotion);
                        orderPrivateCar.setPromotionUser(driver1.getName());
                        orderPrivateCar.setPromotionPhone(driver1.getPhone());
                        orderPrivateCar.setPromotionDriverId(promotion1);
                     }
                     this.insertOrUpdate(orderPrivateCar);

                     //修改总订单人数
                     OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
                     orderPrivateCar2.setSpellSuccess(1);
@@ -771,7 +780,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();
         }
@@ -860,7 +869,7 @@
                     JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
                     //判断时间
                     if (orderPrivateCar.getTravelTime().getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && orderPrivateCar.getTravelTime().getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) {
                        String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(order.getDriverId()));
                        String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(order.getDriverId()));
//                                Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1).get("distance").toString());
//                                Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString());
                        // TODO: 2023/11/4 已改成计算直线距离
@@ -1302,7 +1311,7 @@
         return orderTaxiService.queryOrderServer(orderId, uid);
      }
      //计算预计距离和剩余时间
      String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
      String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
      if(null == value || "".equals(value)){
         System.err.println("司机没有上传位置信息");
         
@@ -2204,7 +2213,12 @@
            //调用中台创建订单及拉起支付接口
            TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData();
            tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString());
            tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
            //追缴单不要分账
            if(0 == orderPrivateCar.getRecoveryOrder()){
               tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
            }else{
               tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
            }
            tradeOrderCreateData.setCharge(new BigDecimal(orderMoney));
            tradeOrderCreateData.setOrderId(orderPrivateCar.getTravelId());
            tradeOrderCreateData.setOrderNo("PR" + orderPrivateCar.getId());
@@ -2218,6 +2232,11 @@
            List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
            GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
            goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
            if(0 == orderPrivateCar.getRecoveryOrder()){
               goodsInfoRequest.setProfitSharing("1");
            }else{
               goodsInfoRequest.setProfitSharing("0");
            }
            goodsInfo.add(goodsInfoRequest);
            tradeOrderCreateData.setGoodsInfo(goodsInfo);
            TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData);
@@ -2238,6 +2257,11 @@
            List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
            GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
            goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
            if(0 == orderPrivateCar.getRecoveryOrder()){
               goodsInfoRequest.setProfitSharing("1");
            }else{
               goodsInfoRequest.setProfitSharing("0");
            }
            goodsInfo.add(goodsInfoRequest);
            tradePayOff1Data.setGoodsInfo(goodsInfo);
            PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data);
@@ -2333,7 +2357,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
@@ -2361,8 +2390,12 @@
         resultUtil = appOrderController.placeAnOrder(new BigDecimal(orderMoney), 4, orderId, 6, integer);
         
      }
		
      this.updateAllColumnById(orderPrivateCar);

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


      return resultUtil;
   }
   
@@ -2841,12 +2874,15 @@
                     }
                  }
                  Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                  Integer state = orderPrivateCarMapper.selectById(orderPrivateCar.getId()).getState();
                  OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
                  Integer state =orderPrivateCar1.getState();
                  if (state > 1) {
                     orderIds.remove(orderPrivateCar.getId());
                     break;
                  }
                  if (i == querys.size() + 5) {
                     orderPrivateCar1.setState(10);
                     orderPrivateCarMapper.updateById(orderPrivateCar1);
                     pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
                     orderIds.remove(orderPrivateCar.getId());
                  }
@@ -2957,15 +2993,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);
         }
      }