xingzai 10 bulan lalu
induk
melakukan
49572c6906
2 mengubah file dengan 22 tambahan dan 0 penghapusan
  1. 15 0
      models/order/order_virtual_asset.go
  2. 7 0
      services/activity.go

+ 15 - 0
models/order/order_virtual_asset.go

@@ -96,6 +96,21 @@ func GetCygxOrderVirtualAssetdCount(condition string, pars []interface{}) (count
 	return
 }
 
+// 获取购买的单场活动
+func GetCygxOrderVirtualAssetActivityList(sourceIds []int, mobile string) (items []*CygxOrderVirtualAsset, err error) {
+	lenArr := len(sourceIds)
+	if lenArr == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	sql := `SELECT source_id
+			FROM
+			cygx_order_virtual_asset
+			WHERE  1=1 AND    source = 'activity'  mobile= ? AND  source_id  IN (` + utils.GetOrmInReplace(lenArr) + `)  `
+	_, err = o.Raw(sql, mobile, sourceIds).QueryRows(&items)
+	return
+}
+
 // 移除用户活动权限记录
 func RemoveCygxOrderVirtualAsset(item *CygxOrderVirtualAsset, itemOrder *CygxOrder) (err error) {
 	o, err := orm.NewOrm().Begin()

+ 7 - 0
services/activity.go

@@ -819,6 +819,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		IsResearchSpecial:       v.IsResearchSpecial,
 		LinkParticipants:        v.LinkParticipants,
 		IsResearchPoints:        v.IsResearchPoints,
+		IsResearchPointsByUser:  v.IsResearchPointsByUser,
 		IsExternalLabel:         v.IsExternalLabel,
 		SiginupDeadline:         v.SiginupDeadline,
 		CancelDeadline:          v.CancelDeadline,
@@ -897,6 +898,12 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 		return
 	}
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+
+	//virtualAssetActivityList ,e := order.GetCygxOrderVirtualAssetActivityList(activityIds, user.Mobile)
+	//if e != nil {
+	//	e = errors.New("GetCygxOrderVirtualAssetActivityList, Err: " + e.Error())
+	//	return
+	//}
 	for _, activityDetail := range items {
 
 		//IsShowAppointment       bool                       `description:"是否展示预约纪要"`