zwxi 10 months ago
parent
commit
0b99d9be2a
1 changed files with 13 additions and 13 deletions
  1. 13 13
      controllers/company_share.go

+ 13 - 13
controllers/company_share.go

@@ -407,9 +407,9 @@ func (this *CompanyController) CompanyShareList() {
 		itemStatus := item.Status
 		if itemStatus != "" {
 			if !strings.Contains(item.Status, "/") {
-				if itemStatus == utils.COMPANY_STATUS_FOREVER { //永续
+				if strings.Contains(itemStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 					expireDay = "-"
-				} else if itemStatus == utils.COMPANY_STATUS_TRY_OUT || itemStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_TRY_OUT) || strings.Contains(itemStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
 						endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -421,9 +421,9 @@ func (this *CompanyController) CompanyShareList() {
 					} else {
 						expireDay = "-"
 					}
-				} else if itemStatus == utils.COMPANY_STATUS_LOSE {
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_LOSE) {
 					expireDay = "-"
-				} else if itemStatus == utils.COMPANY_STATUS_FREEZE {
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_FREEZE) {
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
 						endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -452,9 +452,9 @@ func (this *CompanyController) CompanyShareList() {
 						ficcEndDate = endDateArr[0]
 						tryEndDate = endDateArr[1]
 					}
-					if ficcStatus == utils.COMPANY_STATUS_FOREVER { //永续
+					if strings.Contains(ficcStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 						ficcExpireDay = "-"
-					} else if ficcStatus == utils.COMPANY_STATUS_TRY_OUT || ficcStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(ficcStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 						if ficcEndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, ficcEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -466,9 +466,9 @@ func (this *CompanyController) CompanyShareList() {
 						} else {
 							ficcExpireDay = "-"
 						}
-					} else if ficcStatus == utils.COMPANY_STATUS_LOSE { //流失
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_LOSE) { //流失
 						ficcExpireDay = "-"
-					} else if ficcStatus == utils.COMPANY_STATUS_FREEZE { //冻结
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_FREEZE) { //冻结
 						if item.StartDate != "" && item.EndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, ficcEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -484,9 +484,9 @@ func (this *CompanyController) CompanyShareList() {
 						ficcExpireDay = "-"
 					}
 
-					if raiStatus == utils.COMPANY_STATUS_FOREVER { //永续
+					if strings.Contains(raiStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 						tryExpireDay = "-"
-					} else if raiStatus == utils.COMPANY_STATUS_TRY_OUT || raiStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(raiStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 						if tryEndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, tryEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -498,9 +498,9 @@ func (this *CompanyController) CompanyShareList() {
 						} else {
 							tryExpireDay = "-"
 						}
-					} else if raiStatus == utils.COMPANY_STATUS_LOSE { //流失
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_LOSE) { //流失
 						tryExpireDay = "-"
-					} else if raiStatus == utils.COMPANY_STATUS_FREEZE { //冻结
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_FREEZE) { //冻结
 						if item.StartDate != "" && item.EndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, tryEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -533,7 +533,7 @@ func (this *CompanyController) CompanyShareList() {
 		}
 		list[i].BtnItem = btnItem
 
-		if item.FreezeStartDate != "" && item.FreezeEndDate != "" && item.Status == utils.COMPANY_STATUS_FREEZE {
+		if item.FreezeStartDate != "" && item.FreezeEndDate != "" && strings.Contains(item.Status, utils.COMPANY_STATUS_FREEZE) {
 			freezeEndDate, _ := time.Parse(utils.FormatDate, item.FreezeEndDate)
 			if time.Now().Before(freezeEndDate) {
 				expireDays := freezeEndDate.Sub(time.Now()).Hours() / 24