Merge branch 'cygx_9.3.1_0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

# Conflicts:
#	services/activity_special_trip.go

services/activity_special_trip.go

@@ -210,35 +210,3 @@ func ActivitySpecialUserRmind(user *models.WxUserItem, activityId, TripStatus in
 	}
 	return
 }
-
-func init1231() {
-	var condition string
-	var pars []interface{}
-
-	condition += ` AND  t.id < 10000 	 `
-
-	list, err := models.GetCygxActivitySpecialTripListinit(condition, pars)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	for _, v := range list {
-		//流水记录表
-		itemBill := new(models.CygxActivitySpecialTripBill)
-		itemBill.UserId = v.UserId
-		itemBill.ActivityId = v.ActivityId
-		itemBill.CreateTime = v.CreateTime
-		itemBill.Mobile = v.Mobile
-		itemBill.Email = v.Email
-		itemBill.CompanyId = v.CompanyId
-		itemBill.CompanyName = v.CompanyName
-		itemBill.RealName = v.RealName
-		itemBill.Source = 1
-		itemBill.DoType = 1
-		itemBill.BillDetailed = -1 // 流水减一
-		itemBill.RegisterPlatform = 1
-		itemBill.ChartPermissionId = v.ChartPermissionId
-		go models.AddCygxActivitySpecialTripBill(itemBill)
-	}
-}

services/config.go

@@ -47,3 +47,35 @@ func GetIndustryUserFollowMap(user *models.WxUserItem) (itemMap map[int]bool, er
 	itemMap = follwMap
 	return
 }
+
+func init1231() {
+	var condition string
+	var pars []interface{}
+
+	condition += ` AND  t.id < 10000 	 `
+
+	list, err := models.GetCygxActivitySpecialTripListinit(condition, pars)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range list {
+		//流水记录表
+		itemBill := new(models.CygxActivitySpecialTripBill)
+		itemBill.UserId = v.UserId
+		itemBill.ActivityId = v.ActivityId
+		itemBill.CreateTime = v.CreateTime
+		itemBill.Mobile = v.Mobile
+		itemBill.Email = v.Email
+		itemBill.CompanyId = v.CompanyId
+		itemBill.CompanyName = v.CompanyName
+		itemBill.RealName = v.RealName
+		itemBill.Source = 1
+		itemBill.DoType = 1
+		itemBill.BillDetailed = -1 // 流水减一
+		itemBill.RegisterPlatform = 1
+		itemBill.ChartPermissionId = v.ChartPermissionId
+		go models.AddCygxActivitySpecialTripBill(itemBill)
+	}
+}