|
@@ -259,6 +259,9 @@ func Apply(userId int, companyId int64, mobile, email string, applyInfo userReq.
|
|
|
if companyProductInfo.ProductID == 1 {
|
|
|
sellerName = companyProductInfo.SellerName
|
|
|
status = companyProductInfo.Status
|
|
|
+ if companyProductInfo.IsSuspend == 1 {
|
|
|
+ status = `试用暂停`
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if len(sellerNameList) > 0 && len(statusList) > 0 {
|
|
@@ -305,18 +308,20 @@ func Apply(userId int, companyId int64, mobile, email string, applyInfo userReq.
|
|
|
func GetUserTabBar(userInfo user.UserInfo) (list []string, err error) {
|
|
|
//buy,report,chart,activity,user
|
|
|
list = []string{"activity", "user"}
|
|
|
- companyProduct, err := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
|
|
|
- if err != nil {
|
|
|
- if err == utils.ErrNoRow {
|
|
|
- err = nil
|
|
|
- }
|
|
|
- return
|
|
|
- }
|
|
|
- if strings.Contains("永续,正式,试用", companyProduct.Status) {
|
|
|
- list = append(list, "report", "chart")
|
|
|
- }
|
|
|
- if strings.Contains("永续,正式", companyProduct.Status) {
|
|
|
- list = append(list, "buy")
|
|
|
- }
|
|
|
+
|
|
|
+ //companyProduct, err := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
|
|
|
+ //if err != nil {
|
|
|
+ // if err == utils.ErrNoRow {
|
|
|
+ // err = nil
|
|
|
+ // }
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //if strings.Contains("永续,正式,试用", companyProduct.Status) {
|
|
|
+ // list = append(list, "report", "chart")
|
|
|
+ //}
|
|
|
+ //if strings.Contains("永续,正式", companyProduct.Status) {
|
|
|
+ // list = append(list, "buy")
|
|
|
+ //}
|
|
|
+
|
|
|
return
|
|
|
}
|