修改bug

Pu Zhibing

2025-08-05 d8f0615909cedc1446da7c06b2ab7599abe07c9d

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -562,8 +562,8 @@
                  return ResultUtil.error("请先配置价格规则");
               }
               Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId(), systemPriceCity.getId());
               System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
               System.out.println("query1:" + query1);
//               System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
//               System.out.println("query1:" + query1);
               //开始根据不同的方式计算金额
               if (query1 != null) {
                  JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());//等待费
@@ -1416,7 +1416,11 @@
            case 2:
               return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip);
            case 3:
               return orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
               ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);

               orderCrossCityService.promotion(orderId);

               return resultUtil;
            case 4:
               return orderLogisticsService.payLogisticsOrder1(payType, orderId, objectId, objectType, type);
            case 5:
@@ -2152,17 +2156,19 @@
         if("1".equals(data.getStatus())){
            return "error";
         }
         String partnerPayId = data.getPartnerPayId();
         String orderNo = data.getOrderNo();
         String payId = data.getPayId();
         //网约车
         if(partnerPayId.contains("PR")){
            partnerPayId = partnerPayId.substring(2);
            orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(partnerPayId), payId, 1);
         if(orderNo.contains("PR")){
            orderNo = orderNo.substring(2);
            orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(orderNo), payId, 1);
            orderPrivateCarService.promotion(Integer.valueOf(orderNo));
         }
         //出租车
         if(partnerPayId.contains("TA")){
            partnerPayId = partnerPayId.substring(2);
            orderTaxiService.payOrderTaxiCallback(Integer.valueOf(partnerPayId), payId, 1, 0);
         if(orderNo.contains("TA")){
            orderNo = orderNo.substring(2);
            orderTaxiService.payOrderTaxiCallback(Integer.valueOf(orderNo), payId, 1, 0);
            orderTaxiService.promotion(Integer.valueOf(orderNo));
         }
      }catch (Exception e){
         e.printStackTrace();
@@ -2180,12 +2186,6 @@
    */
   private void promotion(Integer orderType, Integer orderId) {
      switch (orderType) {
         case 1:
            orderPrivateCarService.promotion(orderId);
            break;
         case 2:
            orderTaxiService.promotion(orderId);
            break;
         case 3:
            orderCrossCityService.promotion(orderId);
            break;