From 7c985a20ad4e12770bc7905c816163ba0eeaabfc Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 17 十一月 2020 15:58:45 +0800
Subject: [PATCH] 修改剩余车位的统计方式，剩余车位数=车位总数-车库内实际停车数(不含vip)
---
service/carService.go | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index c0bf785..19b61d7 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -30,12 +30,19 @@
TotalPlace: 0,
Left: 0,
}
-
- remainList := sv.getRemainSpaceNum("")
- if remainList != nil {
- for _,r:=range remainList {
- m.TotalPlace += r.TotalPlace
- m.Left += r.LeftPlace
+ //20201117 淇敼缁熻鏂瑰紡锛屾寜鐓� 鍓╀綑杞︿綅鏁�=杞︿綅鎬绘暟-杞﹀簱鍐呭疄闄呭仠杞︽暟锛堥〉闈笂鏄剧ず鐨勶紝涓嶅惈vip杞﹁締鍗犱綅锛�
+ spaceInfo := sv.FindSpaceNo("")
+ if spaceInfo != nil {
+ m.TotalPlace = len(spaceInfo)
+ usedCount := 0
+ for _,si := range spaceInfo {
+ if si.State == 1 {
+ usedCount++
+ }
+ }
+ m.Left = m.TotalPlace-usedCount
+ if m.Left < 0 {
+ m.Left = 0
}
return &m, true
} else {
@@ -429,7 +436,7 @@
//1.鐩墠鏈夎璇嗗埆鐨勯棶棰橈紝浼氭妸D璇嗗埆鎴�0,D鍜�0涓嶅垎
//2.姹夊瓧璇瘑鍒殑鍑犵巼姣旇緝楂�
func isMyPlateNo(plateNoM map[string]string, targetPlateNo string) bool {
- if targetPlateNo != "" {
+ if targetPlateNo != "" && plateNoM != nil {
r := []rune(targetPlateNo)
nctPlateNo := string(r[1:])
--
Gitblit v1.8.0