修改bug

Pu Zhibing

6 天以前 2c5957854caea8b0fc0f7c957a946979e2e5554a

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -138,11 +138,11 @@
   
   
   /**
    * 大于24小时未支付的订单
    * 大于72小时未支付的订单
    */
   public void timoutNoPayment() {
      List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
            .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).last(" and now() >= DATE_ADD(insertTime, INTERVAL 10 MINUTE)"));
            .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).last(" and now() >= DATE_ADD(getoffTime, INTERVAL 10 MINUTE)"));
      List<OrderPrivateCar> orderPrivateCars1 = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
            .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 10 MINUTE)"));
      orderPrivateCars.addAll(orderPrivateCars1);
@@ -151,13 +151,13 @@
            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
            Company company = companyService.selectById(driver.getCompanyId());
            UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
            Double orderMoney = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
            Double orderMoney = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());

            if(null == orderPrivateCar.getIsCreated()){
               //先调中台创建订单
               CreateOrderRequest createOrderRequest = new CreateOrderRequest();
               createOrderRequest.setTreatShopId(driver.getEmpId().toString());
               createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
               createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
               createOrderRequest.setCharge(new BigDecimal(orderMoney));
               createOrderRequest.setOrderNo("PR" + orderPrivateCar.getId());
               createOrderRequest.setOrderId(orderPrivateCar.getTravelId());
@@ -270,141 +270,6 @@
               modifyTravelItineraryRequest.setSupplierShopId(company1.getEnterCode());
               if (2 == orderPrivateCar1.getPromotion()) {
                  Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
                  modifyTravelItineraryRequest.setPromoterId(driver2.getEmpId().toString());
               }
               OrderUtil.modifyTravelItinerary(modifyTravelItineraryRequest);
            }
         } catch (Exception e) {
            e.printStackTrace();
         }
      }
		
      //出租车
      List<OrderTaxi> orderTaxis = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("state", 7)
            .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).last(" and now() >= DATE_ADD(insertTime, INTERVAL 10 MINUTE)"));
      List<OrderTaxi> orderTaxis1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("state", 7)
            .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 10 MINUTE)"));
      orderTaxis.addAll(orderTaxis1);
      for (OrderTaxi orderTaxi : orderTaxis) {
         try {
            Driver driver = driverService.selectById(orderTaxi.getDriverId());
            Company company = companyService.selectById(driver.getCompanyId());
            UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
            Double orderMoney = (1 == orderTaxi.getAbnormal() ? orderTaxi.getOrderMoney() : orderTaxi.getResponsibilityMoney().doubleValue());
            if(null == orderTaxi.getIsCreated()){
               //先调中台创建订单
               CreateOrderRequest createOrderRequest = new CreateOrderRequest();
               createOrderRequest.setTreatShopId(driver.getEmpId().toString());
               createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}");
               createOrderRequest.setCharge(new BigDecimal(orderMoney));
               createOrderRequest.setOrderNo("TA" + orderTaxi.getId());
               createOrderRequest.setOrderId(orderTaxi.getTravelId());
               createOrderRequest.setCustomerId(userInfo.getOnconUUID());
               OrderInfo orderInfo = OrderUtil.tradeOrderCreate(createOrderRequest);
               orderTaxi.setIsCreated(1);
               orderTaxi.setTravelId(orderInfo.getOrderId());
               orderTaxiService.updateById(orderTaxi);
            }
            //使用备付金进行支付订单
            TradePayOffData tradePayOffData = new TradePayOffData();
            tradePayOffData.setPartnerPayId(orderTaxi.getTravelId());
            tradePayOffData.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + "");
            tradePayOffData.setOrderDesc("完成订单");
            PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
            String retCode = payInfo.getRetCode();
            if (!"000000".equals(retCode)) {
               log.error("备付金支付失败：{}", payInfo.getRetMsg());
               return;
            }
            PayInfoData data = payInfo.getData();
            String status = data.getStatus();
            if ("3".equals(status)) {
               log.error("备付金支付失败：{}", payInfo.getRetMsg());
               return;
            }
            if("0".equals(status)){
               //查询支付信息
               GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest();
               getPaymentInfoDataRequest.setPartnerPayId(orderTaxi.getTravelId());
               GetPaymentInfo getPaymentInfo = OrderUtil.paymentInfo(getPaymentInfoDataRequest);
               status = getPaymentInfo.getStatus();
            }
            PayInfoData payInfoData = payInfo.getData();
            PaymentInfo paymentInfo = payInfoData.getPaymentInfos().get(0);
            if(!"0".equals(status)){
               //支付成功，通知三方
               PaymentOrderRequest paymentOrderRequest = new PaymentOrderRequest();
               paymentOrderRequest.setPayItemId(paymentInfo.getPayItemId());
               paymentOrderRequest.setPaymentInfo(JSON.toJSONString(payInfoData.getPaymentInfos()));
               paymentOrderRequest.setOrderId(orderTaxi.getTravelId());
               paymentOrderRequest.setCharge(BigDecimal.valueOf(orderMoney));
               paymentOrderRequest.setPayTime(data.getPayTime());
               paymentOrderRequest.setPaymentSerialNumber(payInfoData.getPayId());
               OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest);
					
               //中台修改订单状态
               ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
               request1.setOrderId(orderTaxi.getTravelId());
               request1.setStatus(9);
               if (null != orderTaxi.getDriverId()) {
                  request1.setDriverId(driver.getEmpId().toString());
                  request1.setSupplierShopId(company.getEnterCode());
               }
               if (2 == orderTaxi.getPromotion()) {
                  Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
                  request1.setPromoterId(driver2.getEmpId().toString());
               }
               OrderUtil.modifyTravelItinerary(request1);
					
               String payId = payInfo.getData().getPayId();
               //copy原始订单后生成追缴单
               OrderTaxi orderTaxi1 = new OrderTaxi();
               BeanUtils.copyProperties(orderTaxi, orderTaxi1);
               orderTaxi1.setId(null);
               orderTaxi1.setRecoveryOrder(1);
               orderTaxi1.setIsGenerateRecoveryOrder(0);
               orderTaxi1.setOldOrderId(orderTaxi.getId());
               orderTaxi1.setRecoveryOrderCreateDate(new Date());
					
               //修改原始订单为支付状态
               orderTaxi.setState(9);
               orderTaxi.setPayType(5);
               orderTaxi.setPayMoney(orderMoney);
               orderTaxi.setPayTime(new Date());
               orderTaxi.setIsGenerateRecoveryOrder(1);
               orderTaxiService.updateById(orderTaxi);
               //保存追缴单
               orderTaxiService.insert(orderTaxi1);
               //添加三方支付记录
               try {
                  paymentRecordService.saveData(1, orderTaxi.getUserId(), 1, orderTaxi.getId(), 2, 3, orderMoney, payId, 2);
               } catch (Exception e) {
                  throw new RuntimeException(e);
               }
					
					
               Driver driver1 = driverService.selectById(orderTaxi1.getDriverId());
               UserInfo userInfo1 = userInfoService.selectById(orderTaxi1.getUserId());
               Company company1 = companyService.selectById(driver1.getCompanyId());
               //调三方订单中心创建行程单
               CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
               request.setOrderNo("TA" + orderTaxi1.getId());
               request.setCustomerId(userInfo1.getOnconUUID());
               request.setDriverId(driver1.getEmpId().toString());
               request.setSupplierShopId(company1.getEnterCode());
               request.setServiceType(1);
               String travelItinerary = OrderUtil.createTravelItinerary(request);
               orderTaxi1.setTravelId(travelItinerary);
               orderTaxi1.setIsCreated(0);
               orderTaxiService.updateById(orderTaxi1);
               //修改订单状态为待支付
               ModifyTravelItineraryRequest modifyTravelItineraryRequest = new ModifyTravelItineraryRequest();
               modifyTravelItineraryRequest.setOrderId(orderTaxi1.getTravelId());
               modifyTravelItineraryRequest.setStatus(orderTaxi1.getState());
               modifyTravelItineraryRequest.setDriverId(driver1.getEmpId().toString());
               modifyTravelItineraryRequest.setSupplierShopId(company1.getEnterCode());
               if (2 == orderTaxi1.getPromotion()) {
                  Driver driver2 = driverService.selectById(orderTaxi1.getPromotionDriverId());
                  modifyTravelItineraryRequest.setPromoterId(driver2.getEmpId().toString());
               }
               OrderUtil.modifyTravelItinerary(modifyTravelItineraryRequest);