会员时间修改

src/main/java/com/charging/chargingparking/dto/AddParkingMember.java

@@ -21,8 +21,9 @@ public class AddParkingMember {
     @NotNull(message = "会员开始时间不能为空")
     private Date memberStartTime;
 
+    private Date memberEndTime;
+
     //会员时长（分钟）
-    @NotNull(message = "会员时长不能为空")
     private Integer memberMin;
 
     //停车场代号

src/main/java/com/charging/chargingparking/service/impl/ParkingMemberServiceImpl.java

@@ -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());