Merge branch 'cygx/mfyx_3.6' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/cygx/activity_vivo_points_set.go

@@ -9,28 +9,28 @@ type CygxActivityVivoPointsSet struct {
 	PointSetId   int       `orm:"column(point_set_id);pk";comment:"主键id"`
 	ActivityId   int       `comment:"活动ID"`
 	PointsObject string    `comment:"扣点设置方式 1:同报名参会时的扣点数、2：输入其余点数"`
-	PointsNum    float64   `comment:"扣点数量"`
-	GoodsMoney   float64   `comment:"商品总价"`
+	PointsNum    string    `comment:"扣点数量"`
+	GoodsMoney   string    `comment:"商品总价"`
 	Source       string    `comment:"来源 activityvideo 活动视频、activityvoice 活动音频"`
 	CreateTime   time.Time `comment:"创建时间"`
 	ModifyTime   time.Time `comment:"更新时间"`
 }
 
 type CygxActivityVivoPointsResp struct {
-	IsPay        int     `comment:"是否付费查看 ,1是。0否，默认否"`
-	PointSetId   int     `orm:"column(point_set_id);pk";comment:"主键id"`
-	ActivityId   int     `comment:"活动ID"`
-	PointsObject string  `comment:"扣点设置方式 1:同报名参会时的扣点数、2：输入其余点数"`
-	PointsNum    float64 `comment:"扣点数量"`
-	GoodsMoney   float64 `comment:"商品总价"`
-	Source       string  `comment:"来源 activityvideo 活动视频、activityvoice 活动音频"`
+	IsPay        int    `comment:"是否付费查看 ,1是。0否，默认否"`
+	PointSetId   int    `orm:"column(point_set_id);pk";comment:"主键id"`
+	ActivityId   int    `comment:"活动ID"`
+	PointsObject string `comment:"扣点设置方式 1:同报名参会时的扣点数、2：输入其余点数"`
+	PointsNum    string `comment:"扣点数量"`
+	GoodsMoney   string `comment:"商品总价"`
+	Source       string `comment:"来源 activityvideo 活动视频、activityvoice 活动音频"`
 }
 
 type CygxActivityVivoPointsSetReq struct {
-	IsPay        int     `comment:"是否付费查看 ,1是。0否，默认否"`
-	PointsObject string  `comment:"扣点设置方式 1:同报名参会时的扣点数、2：输入其余点数"`
-	PointsNum    float64 `comment:"扣点数量"`
-	GoodsMoney   float64 `comment:"商品总价"`
+	IsPay        int    `comment:"是否付费查看 ,1是。0否，默认否"`
+	PointsObject string `comment:"扣点设置方式 1:同报名参会时的扣点数、2：输入其余点数"`
+	PointsNum    string `comment:"扣点数量"`
+	GoodsMoney   string `comment:"商品总价"`
 }
 
 // 根据活动ID判断音视频是否设置了扣点

services/cygx/activity_points_set.go

@@ -415,6 +415,12 @@ func UpdateActivityVivoPointsSet(activityInfo *cygx.ActivityDetail, vivoPointsSe
 		err = errors.New("GetCygxActivityVivoPointsSetCountByActivityId, Err: " + e.Error())
 		return
 	}
+	if vivoPointsSet.PointsNum == "" {
+		vivoPointsSet.PointsNum = "0"
+	}
+	if vivoPointsSet.GoodsMoney == "" {
+		vivoPointsSet.GoodsMoney = "0"
+	}
 	item := new(cygx.CygxActivityVivoPointsSet)
 	item.ActivityId = activityId
 	item.PointsObject = vivoPointsSet.PointsObject