xingzai 2 yıl önce
ebeveyn
işleme
b2d1527619
3 değiştirilmiş dosya ile 12 ekleme ve 5 silme
  1. 1 0
      models/activity.go
  2. 10 4
      services/yidong.go
  3. 1 1
      utils/config.go

+ 1 - 0
models/activity.go

@@ -60,6 +60,7 @@ type CygxActivity struct {
 	IsCanAppointmentMinutes int       `description:"是否可预约纪要 1是 ,0 否 默认0 "`
 	YidongActivityId        string    `description:"易董活动ID"`
 	YidongActivityUrl       string    `description:"易董活动跳转地址"`
+	YidongActivityEndTime   string    `description:"易董活动截止时间"`
 }
 
 type Activity struct {

+ 10 - 4
services/yidong.go

@@ -215,7 +215,7 @@ func GetYiDongActivity() (err error) {
 	mapOldYiDongBody := make(map[string]string)
 	for _, v := range OldActYIdongList {
 		mapOldYiDong[v.YidongActivityId] = v.YidongActivityId
-		mapOldYiDongBody[v.YidongActivityId] = fmt.Sprint(v.ActivityName, v.Label, v.ChartPermissionId, v.ActivityTime, v.DistinguishedGuest)
+		mapOldYiDongBody[v.YidongActivityId] = fmt.Sprint(v.ActivityName, v.Label, v.ChartPermissionId, v.ActivityTime, v.YidongActivityEndTime, v.DistinguishedGuest)
 	}
 	fmt.Println(mapOldYiDongBody)
 	var itemsAdd []*models.CygxActivity
@@ -233,6 +233,7 @@ func GetYiDongActivity() (err error) {
 			item.ChartPermissionName = GetActivityTypeNameWithYiDong(v.IndustrySwName)
 			item.ChartPermissionNames = GetActivityTypeNameWithYiDong(v.IndustrySwName)
 			item.ActivityTime = v.Start
+			item.YidongActivityEndTime = v.End
 			item.ActivityTimeText = GetActivityTextTime(v.Start)
 			item.YidongActivityUrl = v.URL
 			fmt.Println(item.ActivityTimeText)
@@ -255,19 +256,24 @@ func GetYiDongActivity() (err error) {
 				}
 			} else {
 				//如果内容主体有做变更,就修改内容
-				if mapOldYiDongBody[v.ID] != fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.DistinguishedGuest) {
+				if mapOldYiDongBody[v.ID] != fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.YidongActivityEndTime, item.DistinguishedGuest) {
+					fmt.Println("修改")
+					fmt.Println(mapOldYiDongBody[v.ID])
+					fmt.Println(fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.DistinguishedGuest))
 					updateParams := make(map[string]interface{})
 					updateParams["ActivityName"] = item.ActivityName
 					updateParams["Label"] = item.Label
 					updateParams["TemporaryLabel"] = item.TemporaryLabel
+					updateParams["DistinguishedGuest"] = item.DistinguishedGuest
 					updateParams["ChartPermissionId"] = item.ChartPermissionId
 					updateParams["ChartPermissionName"] = item.ChartPermissionName
 					updateParams["ChartPermissionNames"] = item.ChartPermissionNames
 					updateParams["ActivityTime"] = item.ActivityTime
+					updateParams["YidongActivityEndTime"] = item.YidongActivityEndTime
 					updateParams["ActivityTimeText"] = item.ActivityTimeText
 					updateParams["YidongActivityUrl"] = item.YidongActivityUrl
-					whereParam := map[string]interface{}{"chart_id": item.YidongActivityId}
-					err = models.UpdateByExpr(models.CygxChart{}, whereParam, updateParams)
+					whereParam := map[string]interface{}{"yidong_activity_id": item.YidongActivityId}
+					err = models.UpdateByExpr(models.CygxActivity{}, whereParam, updateParams)
 					if err != nil {
 						return err
 					}

+ 1 - 1
utils/config.go

@@ -221,7 +221,7 @@ func init() {
 		TemplateIdByProductXzs = "tNcCUiK_uUkuxaFF7M9NP2RwLkw8uHFjG-TDIxGUKxo"          //产品运行报告通知-模板ID(小助手)
 	}
 
-	//进门财经开放api配置
+	//易董开放api配置
 	YiDongApiConfig()
 }