|
@@ -45,7 +45,8 @@ public class ReleaseTravelController {
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
PrivateOrder privateOrder = releaseTravelService.getTravelVal(travel.getId());
|
|
PrivateOrder privateOrder = releaseTravelService.getTravelVal(travel.getId());
|
|
travel.setDestination(privateOrder.getDestination())
|
|
travel.setDestination(privateOrder.getDestination())
|
|
- .setCapita(Integer.parseInt(df.format(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
|
|
|
|
|
|
+// .setCapita(Integer.parseInt(df.format(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
|
|
|
|
+ .setCapita(Integer.parseInt(String.valueOf(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
|
|
.setTravelDate(privateOrder.getStartTime() + "~" + privateOrder.getEndTime())
|
|
.setTravelDate(privateOrder.getStartTime() + "~" + privateOrder.getEndTime())
|
|
.setTravelDay(((format.parse(privateOrder.getEndTime()).getTime() - format.parse(privateOrder.getStartTime()).getTime()) / (24 * 60 * 60 * 1000)) + "")
|
|
.setTravelDay(((format.parse(privateOrder.getEndTime()).getTime() - format.parse(privateOrder.getStartTime()).getTime()) / (24 * 60 * 60 * 1000)) + "")
|
|
.setPeopleAll(privateOrder.getPeopleAll())
|
|
.setPeopleAll(privateOrder.getPeopleAll())
|