区间扩大的BUG(解决夜间3点左右会员开始时间调整为前天23:00)-鄂DF59895

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

@@ -198,6 +198,13 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
                             parkingMember1.setMemberEndTime(DateUtil.offsetDay(DateUtil.parse(temEndDate3), 1));
                         }
                         if (parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temStartDate3)) >= 0 && parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temEndDate3)) <= 0) {
+                            //add by hbjzws 2023-08-03区间扩大的BUG(解决夜间3点左右会员开始时间调整为前天23:00)
+                            Date d1 =DateUtil.offsetDay(DateUtil.parse(temEndDate3), -1);
+                            String d2 =DateUtil.format(d1, "yyyy-MM-dd");
+                            String d3 =d2 + " 23:00:00";
+                            if(parkingMember1.getMemberStartTime().compareTo(DateUtil.parse(d3))>0){
+                                parkingMember1.setMemberStartTime(DateUtil.parse(d3));
+                            }
                             parkingMember1.setMemberEndTime(DateUtil.parse(temEndDate3));
                         }
                     }else{
@@ -216,7 +223,8 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
                 ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
                 parkingMemberLog.setParkingMemberId(parkingMember1.getId());
                 parkingMemberLog.setCreateTime(new Date());
-                parkingMemberLog.setContent(StrUtil.format("{}会员新增，会员时长{}分钟", addParkingMember.getCarNum(), min));
+               int sc= Convert.toInt(DateUtil.between(parkingMember.getMemberEndTime(), parkingMember.getMemberStartTime(), DateUnit.MINUTE));
+                parkingMemberLog.setContent(StrUtil.format("{}会员新增，会员时长{}分钟", addParkingMember.getCarNum(), sc));
                 parkingMemberLogService.save(parkingMemberLog);
             } else {
 

src/test/java/com/charging/chargingparking/ChargingParkingApplicationTests.java

@@ -85,6 +85,26 @@ class ChargingParkingApplicationTests {
     private ParkingChannelVoiceService parkingChannelVoiceService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private ParkingShopService parkingShopService;
+    @Test
+    void shopDeal() throws Exception {
+        long start = System.currentTimeMillis();
+        log.warn("设备轮询开始时间:{}", DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss"));
+        String carNumber="鄂AT27M1";
+        ParkingShop parkingShop = parkingShopService.getById("1590242398638243842");
+        System.out.println(parkingShop);
+        String inTime = parkingShopService.getInTime(carNumber, parkingShop);
+        System.out.println(inTime);
+
+        String memberTime = DateUtil.format(DateUtil.offsetDay(DateUtil.parse(inTime), 1), "yyyy-MM-dd") + " " + parkingShop.getMemberLeaveTime() + ":00";
+        String days = String.valueOf(DateUtil.betweenDay(DateUtil.parse(inTime, "yyyy-MM-dd"), DateUtil.parse(memberTime, "yyyy-MM-dd"), false));
+        System.out.println(memberTime); System.out.println(days);
+        long end = System.currentTimeMillis();
+        log.warn("设备轮询结束时间:{}", DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss"));
+        log.warn("设备轮询耗时:{}", end-start);
+    }
+
     @Test
     void me2() throws Exception {
         String memberId="";
@@ -348,7 +368,7 @@ class ChargingParkingApplicationTests {
     void contextLoads1111111111111111111111111111() {
 
         try {
-            ParkingRecord parkingRecord = parkingRecordService.getById("1683484367728459777");
+            ParkingRecord parkingRecord = parkingRecordService.getById("1686769417542746114");
             ParkingCostDTO parkingCostDTO  = parkingFeeService.parkingCost2(parkingRecord);
 
             System.out.println(parkingCostDTO);