|
@@ -143,41 +143,43 @@ public class DiDiTripDailyVehicleBillCusInvoke extends DiDiTripDailyVehicleBillI
|
|
JSONObject travelDetailInfo = new JSONObject();
|
|
JSONObject travelDetailInfo = new JSONObject();
|
|
Date startDate = reqbill.getStartdate();
|
|
Date startDate = reqbill.getStartdate();
|
|
Date endDate = reqbill.getEnddate();
|
|
Date endDate = reqbill.getEnddate();
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
|
- calendar.setTimeInMillis(endDate.getTime());
|
|
|
|
- calendar.set(11, 23);
|
|
|
|
- calendar.set(12, 59);
|
|
|
|
- calendar.set(13, 59);
|
|
|
|
- Date time = calendar.getTime();
|
|
|
|
|
|
+// Calendar calendar = Calendar.getInstance();
|
|
|
|
+// calendar.setTimeInMillis(endDate.getTime());
|
|
|
|
+// calendar.set(11, 23);
|
|
|
|
+// calendar.set(12, 59);
|
|
|
|
+// calendar.set(13, 59);
|
|
|
|
+// Date time = calendar.getTime();
|
|
|
|
|
|
if (approval_type == 2) {
|
|
if (approval_type == 2) {
|
|
travelDetailInfo.put("start_time", TripCommonUtil.date2TimeStamp(startDate, "yyyy-MM-dd HH:mm:ss"));
|
|
travelDetailInfo.put("start_time", TripCommonUtil.date2TimeStamp(startDate, "yyyy-MM-dd HH:mm:ss"));
|
|
- travelDetailInfo.put("end_time", TripCommonUtil.date2TimeStamp(time, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
+ travelDetailInfo.put("end_time", TripCommonUtil.date2TimeStamp(endDate, "yyyy-MM-dd HH:mm:ss"));
|
|
travelDetailInfo.put("departure_city_id", TripCityUtil.getDiDiCityId(reqbill.getVehiclecity()).get(reqbill.getVehiclecity()));
|
|
travelDetailInfo.put("departure_city_id", TripCityUtil.getDiDiCityId(reqbill.getVehiclecity()).get(reqbill.getVehiclecity()));
|
|
travelDetailInfo.put("destination_city_id", TripCityUtil.getDiDiCityId(reqbill.getVehiclecity()).get(reqbill.getVehiclecity()));
|
|
travelDetailInfo.put("destination_city_id", TripCityUtil.getDiDiCityId(reqbill.getVehiclecity()).get(reqbill.getVehiclecity()));
|
|
travelDetailInfo.put("departure_city", reqbill.getVehiclecityName());
|
|
travelDetailInfo.put("departure_city", reqbill.getVehiclecityName());
|
|
travelDetailInfo.put("destination_city", reqbill.getVehiclecityName());
|
|
travelDetailInfo.put("destination_city", reqbill.getVehiclecityName());
|
|
travelDetailInfo.put("trip_times", reqbill.getVehiclenumber());
|
|
travelDetailInfo.put("trip_times", reqbill.getVehiclenumber());
|
|
} else if (approval_type == 3) {
|
|
} else if (approval_type == 3) {
|
|
- Calendar instance = Calendar.getInstance();
|
|
|
|
- instance.setTime(time);
|
|
|
|
- instance.add(11, 6);
|
|
|
|
- instance.add(13, 1);
|
|
|
|
- Date newEndDate = instance.getTime();
|
|
|
|
|
|
+// Calendar instance = Calendar.getInstance();
|
|
|
|
+// instance.setTime(time);
|
|
|
|
+// instance.add(11, 6);
|
|
|
|
+// instance.add(13, 1);
|
|
|
|
+// Date newEndDate = instance.getTime();
|
|
|
|
|
|
travelDetailInfo.put("start_time", TripCommonUtil.date2TimeStamp(startDate, "yyyy-MM-dd HH:mm:ss"));
|
|
travelDetailInfo.put("start_time", TripCommonUtil.date2TimeStamp(startDate, "yyyy-MM-dd HH:mm:ss"));
|
|
- travelDetailInfo.put("end_time", TripCommonUtil.date2TimeStamp(newEndDate, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
+ travelDetailInfo.put("end_time", TripCommonUtil.date2TimeStamp(endDate, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
|
|
+ //用车城市
|
|
JSONArray trips = new JSONArray();
|
|
JSONArray trips = new JSONArray();
|
|
JSONObject trip = new JSONObject();
|
|
JSONObject trip = new JSONObject();
|
|
|
|
|
|
trip.put("city_id", TripCityUtil.getDiDiCityId(reqbill.getVehiclecity()).get(reqbill.getVehiclecity()));
|
|
trip.put("city_id", TripCityUtil.getDiDiCityId(reqbill.getVehiclecity()).get(reqbill.getVehiclecity()));
|
|
trip.put("city", reqbill.getVehiclecityName());
|
|
trip.put("city", reqbill.getVehiclecityName());
|
|
- trip.put("trip_times", -1);
|
|
|
|
|
|
|
|
trips.add(trip);
|
|
trips.add(trip);
|
|
-
|
|
|
|
travelDetailInfo.put("trips", trips);
|
|
travelDetailInfo.put("trips", trips);
|
|
|
|
+
|
|
|
|
+ //打车次数
|
|
|
|
+ travelDetailInfo.put("trip_times", -1);
|
|
}
|
|
}
|
|
|
|
|
|
return travelDetailInfo;
|
|
return travelDetailInfo;
|