|
@@ -787,7 +787,15 @@ public class ParkingMemberInfoController {
|
|
|
throw new Exception("商户会员券时间错误");
|
|
|
}
|
|
|
String inTime = parkingShopService.getInTime(carNumber, parkingShop);
|
|
|
- String memberTime = DateUtil.format(DateUtil.offsetDay(new Date(), 1), "yyyy-MM-dd") + " " + parkingShop.getMemberLeaveTime() + ":00";
|
|
|
+// String memberTime = DateUtil.format(DateUtil.offsetDay(new Date(), 1), "yyyy-MM-dd") + " " + parkingShop.getMemberLeaveTime() + ":00";
|
|
|
+
|
|
|
+
|
|
|
+ //add by hbjzws 2023-07-31 锦添物业停车场-酒店会员扫码BUG修复 会员结束时间是以入场时间计算,不是以当前时间计算
|
|
|
+ //BUG出处 鄂AT27M1 2023-07-31 00:06:50
|
|
|
+ //2023-07-30 23:52:38
|
|
|
+ //2023-08-01 15:00:00
|
|
|
+ //2
|
|
|
+ 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));
|
|
|
String id = parkingMemberService.giveParkingMemberNew(carNumber.toUpperCase(), days, memberName, null, parkingShop, memberTime, inTime,2);
|
|
|
dataMap.put("id", id);
|