修改2.0 bug

Pu Zhibing

2024-10-21 f08b7e95bc941a72d4a7b7bc64c2086ed53f1565

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java

@@ -51,8 +51,30 @@
   private final String consumerPrivateKeyId = "40acf82cbd5250de2f5123caff40738bdd403b08";
   
   private final String consumerPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSwtbSBFgIXna6mWeKFWCK31NXUJH6uGduR1XrODGRedrqrTgr0BdNg8PDo6/zh/T+K0Svor6kgqpwnl9soOdn73oC4Nu+Ad7EiKa38j650jlZdLAr4hR0Ou9Kcnv45x/94auUO8jBz844cu24swLKiPsK9OnX65wVlKRfhhkGFuS/4OI76CmE7NqZDqPOW16o8tBO5TsgPVNkglFAU73fTp0kcHoLauT9QOB0+yZi39mnNXyU+2cL3Ylp5oaQCJpyssDRUqz/EiHa7FxUUgzCadG00+ePf5iYSnZKQRKWoOIawFvcCfcHx8GAl8Nn+79HtVQHB9hLsQ5+jqcdfKPfAgMBAAECggEAE9Ufz912xzrUY1TCKH1Ae3Dub732Lqihmv/9dsfv6ieUURcBvSW0u6eViVhi20DE7hH2QazH0cU18qkEg71UaTRgv9qW8vdMFiRhw9d4zZWZrfBMD6UTlahiEhhZ0B83pHVS5v0FNC+w0SEHe6Tks1hWfz5yrs3N/z3ghdihjC/5i1jeBoHXs1262SMazuwNGHblLApGPG+86taeFtbDI+31TKvZ8nomZHkEVFnARRUoBBcIwowRMqNfwlpcJhlz6kDWnoD08kHJ2zzJokozu7Lim+Ugt/MWwUOcA0hgq2QdymZFpkRkDl7tZmJtwTfTirjbGlpnPHVXEc1bWM7ocQKBgQD0LJ8e7JXf6bVFngq0jSJNKK7XDHYg0KhHXMApF59xxi29hdHXWPzgRJ45KkoUJc7MITpIJLXfCmi1XyDMf9m8lIf/oaqhJ7idYi7iAAPOJkdnHbSt0lebyjBWzCQ6OgS4NfF1+LEibTzRqiFs5K8EAyPYAVSTrpWoguoWtTzIGQKBgQDc9/I2PS+91Eb5RvuidTNsDqZJliTJQFlBjlDViFo3+l1N7jDFYwPBR/Tv4TVM5p9Zb+/Lo9X1pjDbm8QriTR4V+4HaLXkcCnmOsdSRInFUW4UIafwLX5ifjgfyaWgdKdn2UP1Lu/1qBN6GU1xjSfBQ6N3UqQiKkNPb7tuPJGqtwKBgQCQ4hU8vTclGMC14VQK1B/BVt1/vuYtDIJ9bZycBWdXlDc52LitpiDOVgjodJ5mHBT77M9vVVERWlTNIfgNP+OL0TptRZlAbJhP0p1s/oNDhFUj6211InVXfH54UkNAxYJdZ6yxynIYsma/JcsVmQ/8Ony/Q/LSempVBfEurjW1qQKBgQCQWPjFLdtOKqnildg0HFPnNvqx/38waPTluk5b76LgBpGFIyCBEVmWnacIPRpQjidyiYkggnp26oXoMC1KM2svYmGAPYr1G8CDQcqLl3JYkAVU6VeHsnBpbwLC4TttQkdJs8iNFohy9cUjcfwBPbDGs6TJghbuqqUl81uBe9e8qQKBgQDZm8T2KB34J7HAc5A+vqkmAo7mQLZg51OrzB1KnDU86pSAf0o3eSvfDUT6dpU9fRuZ1XYnbPnpoJwjFH3m4u9gqKF3PtVYfZyJrEqYwmhB9z6vd+dcsUlXM0fi37bGZkKBD0JGGt5OljM1qJG15x/LYfC/nwOmqWoOhNPCst2Z7w==";
   private final static String key = "AIzaSyCG6PsfkaCEc94VK2vIAZk1YYKvOS_Ewts";
	
   private final String provider = "i-go-odrd-testing";
	
   private final static String key = "AIzaSyCG6PsfkaCEc94VK2vIAZk1YYKvOS_Ewts";

//   private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-gcp.iam.gserviceaccount.com";
//
//   private final String DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-gcp.iam.gserviceaccount.com";
//
//   private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-gcp.iam.gserviceaccount.com";
//
//   private final String serverPrivateKeyId = "56d803e4689659cf087c0864d6216bb36b7c0740";
//
//   private final String serverPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSS/aiWM1SybXt9EJx8ulLU5HJ7y1QVmUozcFypOehH3mTW7gJ1UGwHZxMpMaO3N2iRclWBHsMd4t6zYPn2Ao/leIOB2RQGcrWYu527gLrr+nXlfXkAXBBnsV55O1cbdnGK+CIF5UYGvpDkQTD3+7hATBl9kug8D5XpYfKFqnP2a5fEeJaXhPyc5z9eJjOWjJ9DfxGxf9M8Z2+/DAPxNqsML7IKw69jcmWpUoN9sJEx55jke8e4dbRFRcrRSHReThT5UW7HDkHeVtgMSh2b3MnrVYqBHLahJCXiiUdFwlwqaJWwTbXtZJVpvL4dpRbFiCrkEieerBaYajLmxlOJSvhAgMBAAECggEALyTgcZy+yuR1aJbtnmX6buyZLk/0NKJpozAdQfo+AxzvQF27cFjilPzOYVA/Qx+4f/xtGl9+xli2aB1SiNMh2Qdc2hBGKL7ffhhHpVnORc/1+GKh8S9xXwSc+Kqdm670tzx25YuD3RePKz6DdvXos4B0vSbt5XJ2R2fQfTl/cBzQju6u5QI2bVutxm+eaLXUfTVRi5N8EqW6deRAJxgn6VWOEOqBBAxgLaB90hJ9zjcDBDGurUXVumBQX4OVE6+4F1wyMNrjpFosSChJnCZ+ngSulPHHNUVnTeoXzTkp8EXb5o4B7sGoHGxFMGC8f7e5cfPPYtKmtv9s6WzZOshx0QKBgQD0+25fN1lLJxRJlBY+WymcRueEV0JKNGTgGVX0Yc6/1abyUO6mJD7yzhdvgm3/3CwWMOsnIG/+7gv7MAfwmVcs9UoebFl8z6VLzMD5GiuwCHoTRHsr9hTS38dSOr9l0/5s6n1LI4A6StWvolsVvwdM76nEBvNlRkfG3OV1crhaIwKBgQDbwS+2Xrr79cgYwktWnGCEmEDWAxTk3xZf6P/33/+9jnH49ahoEQZHltkRNpEx6axyd0qpEPmzo+xqZPirRdl+LYioF0Mt+mSaX5K5bJJ49FkqnQtUkdV9Zg0FotSxCeOFf5upaHQ7JrCdyvUBkFhEr1U+kcccEs8rB9b6oyZYKwKBgQDaEl7Df1+LGHRkst/CDiBSLoO0OICX0V/iZGsxKUeDWEpN9WEan7UxKeeOqYoFchYEgvMwVx2azof3x1+p+rWxHYAm6MgX5Db97HvywisVfdY9BH6oOVt8AxtIxWbO3BDlHy79DdL9ENR6jYmLKAr1n3l9N7q98fu+t6/CBqa4BQKBgQDOyb2CGSZPDntagQqv17sjSrpIKOIydJLzcafcstZOo4owQcpVEyAboaFlhzmeBEuX8xU4fpbaKji/7X/qe3IsP+DGfA1laKfedGz3O2mhlB2L8ffFfu2scKl0UkNezPVinC/4fChTuRadhWyEKjZFe8/1buw0SKbV0SzE8V2VvQKBgQCC0Vor+pLLkDVwlkg4fc0QNudepiEa61dRxdlWxy3BFfW/zUuP2x3y0jQYW/IAs7Z3xUqC4nHeOjJwELHgsc41YAP6kvyfAtwTddE3n03HmnlHqDKQ4uMCdJe2BQLBxmugL+yzV+YCW5sFTcRfGbEOI4OFRYoGm7Y6IiEyZGYDag==";
//
//   private final String driverPrivateKeyId = "95f1c08fd235d43abe7350fc860120f930467815";
//
//   private final String driverPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDZY/0BY/9RaTNrNxPnjbMVWl6RSGqYt+cJmAAcX3CEo276mNGGFNwzzsvsaSm2uspC8kelf1x+R0IEEfVKu7SoX2nso2C392iL3Z/lwH92r6LFD8l8IlNJ7g9fBxO6qa+v94a8BsYsj1bVDjS2Jw4PzQ5uwlTSawDlk6cQnOBCnXhDHSw4Zv51hGdYibv1LS7on9SF//0YBrfuL50lGVBgBkbjLv73eO4RRMv12YWeYntxuRqRjnD26VGcSWU2dQBlag17bioFPbd2NrpJWzDSAUTeOvu1Z5RX7QzrnICv/onz1vSJL/bzuuhBqJXt0KxdoDuoBc0AFq+tTxMcuc+DAgMBAAECggEABs9YDKQaSm2WO8SU7gsFUiTrk3eGR1Rze1x0nG7s8mrAPj9tSNr8bu8KelRtBxlg3qoCTo/n0Njgm4oIehfZN/ENO2l+zSSF9OOzb5oRJCGqYqv07tuQal93wc1R8+X+5+9EHD3GFX1EBhaU1iPxD9OnoRabW6AYfhibAi035T5ExtSZKF0eiiOgWQF7fljkcUoZliD3FXckK8qYhjgFLzyu0MXqDl49HfjaraQWL9dfuJq083hjivqBHdeY0krBa4VsWaaepwcnOGiHm2x7fJIpBYTrmToQGPB1MClXgeEhBCvP2DY2Hj3sqqwFKJcjgnCeTBA5/pO8V0O+6MAtcQKBgQD8YZnnw5KXg+s2vxYSEC0qXde1tMN6BziFCpp0hy02LcRLcsni7h+31++d9bPscuENadz2Lts4jTNwnc162B/TJHtP+VRBs1oVbpkAdouOXNU1mLRyy7NfuHbLfOtXDXE7J4Los63GeBt0AX4YNPuYQ3mBhW3mUHHNPs7AhIs4uQKBgQDcgfL/AXOmgZnglzp9phr6a0pxVlerSeNRUrcpQ3M41t9XaFLM8b6HX94DqsJ8n6bknnBV/gdDdwwIGvNKhcoNa/jbTRv9UAsBef49Ak8Vq3VudEsqQCkBP4B2+WmBBNuBQy9CUrIn8nPScjU8bhpFqKmQxqCfYn29hY8jxY90GwKBgQCw+a/2uUmePb8+0JglanqBbvTIUk2Q0Gdtw5WziObHSyiOz5uKKfjL7fv1BEp6z8PIqCdt6kWHTlx35/Ai6FLIuJhP6EKRH7dXuApKLNaHqclIoCBJL1ZFFREYeCx/CsoP9RDzJKwCtE5r9m/5gY27o/UcQfhivJ5Qkm5gyZDm4QKBgB1erZfrgJTn5C/21JKRwjwieDraTjkBUWauhrjXRAyJChxhR84GUONFEJQadWcV+KuwsrOxbxQ8UfzuYgNGCKB7Bh1nitfVhnG+5u8HVLNFMBHzKWPKQevpolm2ZKgLlpUD9tJ1o0cQ0v5vucl/vL4UdelTm2c/PhI1LNiN4sqLAoGATpugMjecjHvJwHG1Qk5dSIFt1ndc3MmYkLP+bAYMLDZmYbGlCv4Q+YuIyeoCpQNguWO9GqtquqM+yj0zoWn0BNTGhygqInBrLTwxzkfRQGGru0h9GsdhedkE7KJuJgOMYZIk7mZUKONK68CehQR6hYSHZ9a7VfljPpC5F1uuRCM=";
//
//   private final String consumerPrivateKeyId = "37eb9db5c3821cb8a13a15f86b2da194f4cb0959";
//
//   private final String consumerPrivateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCeBruAMii4e7LrGNwSWMbeztzjJV9lUS9CIhWi142G/Ed9b58oa1CAM3ym794PRqtHRvdzLSWRKf3SFJjzYl7CMmkpTgsQoV8tCp/G/vITZcrD9BxYfocysnSDy9d/nleomC1PeUV6coZpGPIjwuxkXyQbH1CnTyGK5RAU2siCw4plLMz6WQyXXyCZOdCijsvSPgytDWveO8DGPIBO1VlHHIJIfrfgVCYgpaXd63GSPQEJ81GYfy5VtnuLHpc3kowq5blLqMFUU6eAzA20Jg3mCovv2idSNN6R5K1kNT3Eu5fsQWuthDqK0H2IeNulb8cCPnri62AH03kxl6xFwC6pAgMBAAECggEAETkH88TZDfeNXHTCfM1oKfMUZ+fe1HAGB93Ryy8ATGyabgqy/KNq4U4QkTEmBowxMVIuuJgnDAHY7q3dWElUV93z+tMiqZas2iqE7MSZ0DtmifdvpMVwKWUBsIuQL7yA2UMcom4ZKxXoSElhD+diqYh6VZUSzpP1QpS3LU6wTm/4IzN+kjfn7sAENk9+ff04VZjBC4yPANWO6gXmNZlGvFvbp6ChBb9PnPlB6dUUiLCGkb/B0jagfqP7ARrDArMcRpJZyYbPDEfxEqqADV28N4k2qOYUZYVmXBXf+Zip7G+rikXmgxn/G1nHLJgUAmc42TUos8P0YsZiVyboQYtU8QKBgQDRcLK70zIZOhMRmr9gTC2khSBA37ZVVtCiJb6G4TtFfH7KLdn8r8aNLauH90WCzQvk2m/KKFlt/q2UJyFatJx5LB4mYKAS7BPfoHYqsoqDMuMXtNpe6PO5/rx8h90pl60gouG2iw1QcOq5NKNVr2INYkItJhc8u99Lhw675hVVOwKBgQDBKA2e1KERO3cOn7muaJjWubMJ6mK0XtOLmTL8maILwJVO2H6rMOxoYum3txZjc+oTdFcyfv5TJZrihm3F2XoZ6Xe1F0OhiX97OgA/uDygQSDsiFdhJ90svbpGxDxtQtamhuu+8Wp1TpNu8ORdG+3gmsCkxivrPTs/MnJnfiu9awKBgGJ1QYDsyvtzAq3e+qKxjS9vafc1dAjwVAo2BjhwP6Xt3cj7/yM8GvIZiy7S/rl73WCLk8wMZeZAuKcSMirrBzgrlkziVb4vfzQ8wfBWmKkOzhVB7vp5NsK0TzWXxU+dP0U9bTCcc/jh7GZ+qV5JoaW7EHMbGgdyJoniBvosMtErAoGAKVRvraejmzNVI0zsBzScV32+oIWFf0C3FSy/qysYcFlR2WAbonfCbgeUKNpFMRyRXn5LViO0OYhXXtcSz/3b0YWSNq52qy7nly9u9DNwzX2CFPqLb99+xN8H57J/l4VwtosyEFZJyDX6+AcVZhLe0GtsgxVgOmKMtdYOgrSNmWcCgYBu3KiRwYPfQgyEYOwfQBOjoMmPUB8H/vtvFLRlHXxZF7hPAyKs4e9dQRW7vb61epVgMVz5t4E4pKHqxpZu+j7Tby+Z5fAgSPiniZUyVH9AYGCTyAYZogr5r21vhpcAZJ0P8hoE5R2jhnzu/mhr6CkWz8nCHsZ7+KBjcVILUYIS9g==";
//
//   private final String provider = "i-go-gcp";
   
   @Autowired
   private RedisUtil redisUtil;
@@ -67,7 +89,7 @@
    * @param type 0=服务端，1=乘客，2=司机
    * @return
    */
      public Map<String, Object> fleetEngineAuth(int type, String id){
   public Map<String, Object> fleetEngineAuth(int type, String id){
      try {
         //谷歌云服务器使用这部分代码
//         AuthTokenMinter minter = AuthTokenMinter.builder()
@@ -108,7 +130,7 @@
         map.put("token", jwt);
         map.put("expirationTimestamp", expirationTimestamp);
         return map;
      } catch (SigningTokenException e) {
      } catch (Exception e) {
         throw new RuntimeException(e);
      }
   }
@@ -145,7 +167,7 @@
    * @param licensePlate 车牌号
    * @param id 车辆id
    */
   public String createVehicles(int maximumCapacity, String licensePlate, String id) throws Exception{
   public boolean createVehicles(int maximumCapacity, String licensePlate, String id) {
      String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/vehicles?vehicleId=" + id;
      HttpRequest post = HttpUtil.createPost(url);
      Map<String, String> headers = new HashMap<>();
@@ -155,7 +177,7 @@
      
      JSONObject body = new JSONObject();
      body.put("vehicleState", "OFFLINE");
      body.put("supportedTripTypes", Arrays.asList("SHARED", "EXCLUSIVE"));
      body.put("supportedTripTypes", "EXCLUSIVE");
      body.put("maximumCapacity", maximumCapacity);
      
      JSONObject category = new JSONObject();
@@ -185,7 +207,8 @@
               return createVehicles(maximumCapacity, licensePlate, id);
            }
         }
         throw new Exception(response.body());
         log.error("添加车辆信息异常：  licensePlate={},   body={}", licensePlate, response.body());
         return false;
      }
      /**
       * 返回结果
@@ -208,43 +231,10 @@
       *    "waypointsVersion": "2024-05-23T03:05:23.293329Z"
       * }
       */
      return response.body();
   }

   /**
    * 上报google可结算订单
    * @param tripId 行程id
    * @return
    */
   public boolean reportBillableEvent(String tripId) throws Exception {
      String billableEventId = UUIDUtil.getRandomCode();
      String url = "https://mobilitybilling.googleapis.com/v1:reportBillableEvent?regionCode=GH&key=" + key + "&billableEventId=" + billableEventId;
      HttpRequest post = HttpUtil.createPost(url);
      Map<String, String> headers = new HashMap<>();
      headers.put("Authorization", "Bearer " + getToken());
      headers.put("Content-Type", "application/json");
      post.addHeaders(headers);
      JSONObject body = new JSONObject();
      body.put("related_ids", "[\"" + tripId + "\"]");
      post.body(body.toJSONString());










      //上线客户测试和上线运营开放
//      HttpResponse response = post.execute();
//      if(200 != response.getStatus()){
//         logger.error(response.body());
//         throw new Exception(response.body());
//      }
      return true;
   }
	
	
   /**
    * 修改车辆信息
    * @param maximumCapacity
@@ -252,7 +242,7 @@
    * @param id
    * @return
    */
   public String updateVehicles(String vehicleState, Integer maximumCapacity, String licensePlate, String id) throws Exception{
   public boolean updateVehicles(String vehicleState, Integer maximumCapacity, String licensePlate, String id) {
      String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/vehicles/" + id + "?updateMask=";
      List<String> sb = new ArrayList<>();
      if(StringUtils.hasLength(vehicleState)){
@@ -291,7 +281,7 @@
         licensePlate1.put("lastCharacter", getLastNumber(licensePlate));
         body.put("licensePlate", licensePlate1);
      }
      body.put("supportedTripTypes", Arrays.asList("SHARED", "EXCLUSIVE"));
      body.put("supportedTripTypes", "EXCLUSIVE");
      
      JSONObject category = new JSONObject();
      category.put("category", "TAXI");
@@ -316,7 +306,8 @@
               return updateVehicles(vehicleState, maximumCapacity, licensePlate, id);
            }
         }
         throw new Exception(response.body());
         log.error("修改车辆信息异常：  licensePlate={},   body={}", licensePlate, response.body());
         return false;
      }
      /**
       * 返回结果
@@ -339,7 +330,7 @@
       *   "waypointsVersion": "2024-05-23T03:05:23.293329Z"
       * }
       */
      return response.body();
      return true;
   }
   
   
@@ -348,7 +339,7 @@
    * @param id 车辆id
    * @return
    */
   public String getVehicles(String id) throws Exception{
   public String getVehicles(String id){
      String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/vehicles/" + (null != id ? id : "");
      HttpRequest get = HttpUtil.createGet(url);
      Map<String, String> headers = new HashMap<>();
@@ -377,7 +368,8 @@
               return getVehicles(id);
            }
         }
         throw new Exception(response.body());
         log.error("查询车辆信息异常：  id={},   body={}", id, response.body());
         return null;
      }
      /**
       * 返回结果
@@ -457,7 +449,7 @@
    * @param end_lng 终点经度
    * @return
    */
   public String createTrip(String vehicleId, Integer numberOfPassengers, String tripId, String start_lat, String start_lng, String end_lat, String end_lng) throws Exception{
   public boolean createTrip(String vehicleId, Integer numberOfPassengers, String tripId, String start_lat, String start_lng, String end_lat, String end_lng) {
      String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/trips?tripId=" + tripId;
      HttpRequest post = HttpUtil.createPost(url);
      Map<String, String> headers = new HashMap<>();
@@ -470,7 +462,7 @@
         body.put("vehicleId", vehicleId);
      }
      body.put("tripStatus", "NEW");
      body.put("tripType", "SHARED");
      body.put("tripType", "EXCLUSIVE");
      body.put("numberOfPassengers", numberOfPassengers);
      
      JSONObject pickupPoint = new JSONObject();
@@ -506,7 +498,8 @@
               return createTrip(vehicleId, numberOfPassengers, tripId, start_lat, start_lng, end_lat, end_lng);
            }
         }
         throw new Exception(response.body());
         logger.error("创建行程异常：  tripId={}  body={}", tripId, response.body());
         return false;
      }
      /**
       * 返回结果
@@ -623,7 +616,7 @@
       *    "currentRouteSegmentTrafficVersion": "2024-05-27T02:05:37.941167Z"
       * }
       */
      return response.body();
      return true;
   }
   
   
@@ -639,7 +632,7 @@
    * @param end_lng 终点经度
    * @return
    */
   public String updateTrip(String tripStatus, String vehicleId, Integer numberOfPassengers, String tripId, String start_lat, String start_lng, String end_lat, String end_lng) throws Exception {
   public boolean updateTrip(String tripStatus, String vehicleId, Integer numberOfPassengers, String tripId, String start_lat, String start_lng, String end_lat, String end_lng) {
      String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/trips/" + tripId + "?updateMask=";
      List<String> sb = new ArrayList<>();
      if(StringUtils.hasLength(vehicleId)){
@@ -725,7 +718,8 @@
               return updateTrip(tripStatus, vehicleId, numberOfPassengers, tripId, start_lat, start_lng, end_lat, end_lng);
            }
         }
         throw new Exception(response.body());
         logger.error("修改行程异常：  tripId={}  body={}", tripId, response.body());
         return false;
      }
      /**
       * 返回结果
@@ -845,7 +839,7 @@
       *    "numberOfPassengers": 1
       * }
       */
      return response.body();
      return true;
   }
   
   
@@ -855,7 +849,7 @@
    * @param tripId 订单id
    * @return
    */
   public String getTrip(String tripId) throws Exception {
   public String getTrip(String tripId) {
      String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/trips/" + tripId;
      HttpRequest get = HttpUtil.createGet(url);
      Map<String, String> headers = new HashMap<>();
@@ -884,7 +878,8 @@
               return getTrip(tripId);
            }
         }
         throw new Exception(response.body());
         logger.error("获取行程异常：  tripId={}  body={}", tripId, response.body());
         return null;
      }
      /**
       * 返回结果
@@ -967,4 +962,32 @@
      
      return response.body();
   }
	
	
   /**
    * 上报google可结算订单
    * @param tripId 行程id
    * @return
    */
   public boolean reportBillableEvent(String tripId) {
      String billableEventId = UUIDUtil.getRandomCode();
      String url = "https://mobilitybilling.googleapis.com/v1:reportBillableEvent?regionCode=GH&key=" + key + "&billableEventId=" + billableEventId;
      HttpRequest post = HttpUtil.createPost(url);
      Map<String, String> headers = new HashMap<>();
      headers.put("Authorization", "Bearer " + getToken());
      headers.put("Content-Type", "application/json");
      post.addHeaders(headers);
      JSONObject body = new JSONObject();
      body.put("related_ids", "[\"" + tripId + "\"]");
      body.put("regionCode", "GH");
      post.body(body.toJSONString());
      //上线客户测试和上线运营开放
//      HttpResponse response = post.execute();
//      if(200 != response.getStatus()){
//         logger.error("google地图上报结算   tripId：{}   异常：{}", tripId,response.body());
//         return false;
//      }
      return true;
   }
	
}