Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/user.go

@@ -784,16 +784,29 @@ func (this *UserController) ApplyTryOut() {
 				return
 			}
 			if companyItem != nil && companyItem.CompanyId > 0 {
+				companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+					return
+				}
+				if companyProduct != nil && companyProduct.IsSuspend == 1 {
+					CompanyIdType = 6
+				} else {
+					switch companyItem.Status {
+					case "正式":
+						CompanyIdType = 4
+					case "试用":
+						CompanyIdType = 5
+					case "冻结":
+						CompanyIdType = 7
+					case "流失":
+						CompanyIdType = 8
+					}
+				}
 				applyMethod = companyItem.Status + "客户申请"
 				if detailId > 0 {
-					companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-					if err != nil && err.Error() != utils.ErrNoRow() {
-						br.Msg = "获取信息失败"
-						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-						return
-					}
 					if companyProduct != nil && companyProduct.IsSuspend == 1 {
-						CompanyIdType = 6
 						applyMethod = "试用暂停客户"
 					} else {
 						if companyItem.Status == "正式" || companyItem.Status == "试用" {
@@ -801,16 +814,6 @@ func (this *UserController) ApplyTryOut() {
 						} else if companyItem.Status == "冻结" || companyItem.Status == "流失" {
 							applyMethod = companyItem.Status + "客户"
 						}
-						switch companyItem.Status {
-						case "正式":
-							CompanyIdType = 4
-						case "试用":
-							CompanyIdType = 5
-						case "冻结":
-							CompanyIdType = 7
-						case "流失":
-							CompanyIdType = 8
-						}
 					}
 					applyMethod = applyMethod + "," + title
 				}

models/db.go

@@ -101,7 +101,7 @@ func init() {
 		new(CygxUserFollowSpecial),
 	)
 	// 记录ORM查询日志
-	//orm.Debug = true
-	//orm.DebugLog = orm.NewLog(utils.BinLog)
+	orm.Debug = true
+	orm.DebugLog = orm.NewLog(utils.BinLog)
 
 }

services/article.go

@@ -306,7 +306,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	url := "https://vmp.hzinsights.com/v2api/articles/mp?take=100&skip=0&publish_status=2"
+	url := "https://vmp.hzinsights.com/v2api/articles/mp?take=100&skip=0&publish_status=2,4&order=publish_date&sort=DESC"
 	method := "GET"
 	client := &nhttp.Client{}
 	req, err := nhttp.NewRequest(method, url, nil)
@@ -358,7 +358,8 @@ func GetArticleListByApi(cont context.Context) (err error) {
 	var list []*models.Tactics2
 	var listAuthor []*models.CygxArticleAuthor
 	for _, v := range listData {
-		if exitMap[v.SeriesId] > 0 {
+		//状态等于 2 跟 4 的进行同步
+		if exitMap[v.SeriesId] > 0 && (v.PublishStatus == 2 || v.PublishStatus == 4) {
 			v.PublishDate = time.Date(v.PublishDate.Year(), v.PublishDate.Month(), v.PublishDate.Day(), v.PublishDate.Hour(), v.PublishDate.Minute(), v.PublishDate.Second(), v.PublishDate.Nanosecond(), time.Local)
 			item := new(models.Tactics2)
 			itemAuthor := new(models.CygxArticleAuthor)