|
@@ -1,6 +1,8 @@
|
|
|
package com.charging.chargingparking.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.date.DateField;
|
|
|
+import cn.hutool.core.date.DateUnit;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.lang.Validator;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -56,7 +58,17 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
|
|
|
parkingMemberQueryWrapper.last("LIMIT 1");
|
|
|
ParkingMember parkingMember = getOne(parkingMemberQueryWrapper);
|
|
|
|
|
|
- Integer min = addParkingMember.getMemberMin();
|
|
|
+ Integer min = 0;
|
|
|
+
|
|
|
+ if (addParkingMember.getMemberMin() == null){
|
|
|
+ if (addParkingMember.getMemberEndTime() != null){
|
|
|
+ min = Convert.toInt(DateUtil.between(addParkingMember.getMemberStartTime(),addParkingMember.getMemberEndTime(), DateUnit.MINUTE));
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ min = addParkingMember.getMemberMin();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if (parkingMember == null) {
|
|
|
ParkingMember parkingMember1 = new ParkingMember();
|
|
|
parkingMember1.setParkId(addParkingMember.getParkingUname());
|