Merge branches 'develop' and 'feature/20200703_停车场缴费记录_wuping' of…

Merge branches 'develop' and 'feature/20200703_停车场缴费记录_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

order-application-service/src/main/java/cn/freemud/service/impl/ParkingOrderServiceImpl.java

@@ -117,8 +117,7 @@ public class ParkingOrderServiceImpl implements ParkingOrderService {
             respVo.setParkingAreaId(extInfoDto.getParkingAreaId());
             respVo.setParkingAreaName(extInfoDto.getParkingAreaName());
             respVo.setCarNumber(extInfoDto.getCarNumber());
-            Integer diffMinute = DateUtil.diffMinute(new Date(Long.parseLong(extInfoDto.getInTime())), new Date(Long.parseLong(orderInfoReqs.getPayTime())));
-
+            Long diffMinute = (Long.parseLong(orderInfoReqs.getPayTime()) - Long.parseLong(extInfoDto.getInTime()))/1000/60;
             respVo.setParkingTime(diffMinute.toString());
             respVo.setInTime(DateUtil.convert2Str(new Date(Long.parseLong(extInfoDto.getInTime())), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
             respVo.setOutTime(DateUtil.convert2Str(new Date(Long.parseLong(orderInfoReqs.getPayTime())), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));