进场记录取上次出场记录-修改为本次充电开始时间

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

@@ -406,11 +406,30 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
                         parkingRecordQueryWrapper1.last("LIMIT 1");
                         ParkingRecord parkingRecord1 = getOne(parkingRecordQueryWrapper1);
                         if (parkingRecord1 != null) {
+                            //todo 加入充电会员的一条记录，如果开始时间小于此条记录，就以这个时间为准
+                            Date inParkTime =parkingRecord1.getOutParkingTime();
+                            QueryWrapper<ParkingMember> parkingMemberQueryWrapper = new QueryWrapper<>();
+
+                            parkingMemberQueryWrapper.eq("park_id", parkingChannel.getParkId());
+                            parkingMemberQueryWrapper.eq("member_car_num", license);
+                            parkingMemberQueryWrapper.eq("cloud_del_flag", false);
+                            parkingMemberQueryWrapper.orderByDesc("create_time");
+                            parkingMemberQueryWrapper.last("LIMIT 1");
+
+                            ParkingMember parkingMember = parkingMemberService.getOne(parkingMemberQueryWrapper);
+
+                            if(parkingMember!=null&&parkingMember.getMemberStartTime()!=null){
+
+                                if(inParkTime.before(parkingMember.getMemberStartTime())){
+                                    inParkTime =parkingMember.getMemberStartTime();
+                                }
+                            }
+
                             ParkingRecord parkingRecord = new ParkingRecord();
                             parkingRecord.setParkId(parkingRecord1.getParkId());
                             parkingRecord.setCarNum(license);
                             parkingRecord.setOutPlateId(plateId);
-                            parkingRecord.setInParkingTime(parkingRecord1.getOutParkingTime());
+                            parkingRecord.setInParkingTime(inParkTime);
                             parkingRecord.setProductTheme("停车费");
                             parkingRecord.setCarType(parkingRecord1.getCarType());
                             parkingRecord.setCType(parkingRecord1.getCType());