Browse Source

增加账号可付费字段

wuchengs 10 months ago
parent
commit
6c513f188a

+ 23 - 7
api/v1/levelMonitor/image_record.go

@@ -15,7 +15,7 @@ import (
 type ImageRecordApi struct {
 }
 
-//创建图片记录
+// 创建图片记录
 func (a *ImageRecordApi) CreateImageRecord(c *gin.Context) {
 	var record levelMonitor.ImageRecord
 	_ = c.ShouldBindJSON(&record)
@@ -31,6 +31,22 @@ func (a *ImageRecordApi) CreateImageRecord(c *gin.Context) {
 	}
 }
 
+// 修改是否可付费
+func (a *ImageRecordApi) UpCanPay(c *gin.Context) {
+	var record levelMonitor.ImageRecord
+	_ = c.ShouldBindJSON(&record)
+	if err := utils.Verify(record, utils.UpCanPayVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := imageRecordService.UpCanPay(record); err != nil {
+		global.GVA_LOG.Error("修改失败!"+err.Error(), zap.Error(err))
+		response.FailWithMessage("修改失败"+err.Error(), c)
+	} else {
+		response.OkWithMessage("修改成功", c)
+	}
+}
+
 func (a *ImageRecordApi) UpLevel(c *gin.Context) {
 	var record request.CreateLevelRequest
 	_ = c.ShouldBindJSON(&record)
@@ -62,7 +78,7 @@ func (a *ImageRecordApi) UploadOrNot(c *gin.Context) {
 //删除三天前的图片记录
 //func (a *ImageRecordApi) DeleteExpireImageRecord (c *gin.Context)  {}
 
-//查询图片记录列表
+// 查询图片记录列表
 func (a *ImageRecordApi) GetImageRecordList(c *gin.Context) {
 	var paramsInfo request.SearchImageRecordParams
 	_ = c.ShouldBindJSON(&paramsInfo)
@@ -84,8 +100,8 @@ func (a *ImageRecordApi) GetImageRecordList(c *gin.Context) {
 	}
 }
 
-//获取7日数据
-func (a *ImageRecordApi) GetWeekImageRecordStatistics(c *gin.Context)  {
+// 获取7日数据
+func (a *ImageRecordApi) GetWeekImageRecordStatistics(c *gin.Context) {
 	var weekDataRequest request.WeekImageRecordStatisticsRequest
 	_ = c.ShouldBindJSON(&weekDataRequest)
 	if weekDataRequest.TaskId == 0 {
@@ -106,7 +122,7 @@ func (a *ImageRecordApi) GetWeekImageRecordStatistics(c *gin.Context)  {
 	}
 }
 
-//获取等级统计数据列表
+// 获取等级统计数据列表
 func (a *ImageRecordApi) GetImageRecordStatisticsList(c *gin.Context) {
 	var paramsInfo request.SearchImageRecordStatisticsParams
 	_ = c.ShouldBindJSON(&paramsInfo)
@@ -128,7 +144,7 @@ func (a *ImageRecordApi) GetImageRecordStatisticsList(c *gin.Context) {
 	}
 }
 
-//导出等级统计数据列表
+// 导出等级统计数据列表
 func (a *ImageRecordApi) ImageRecordStatisticsExport(c *gin.Context) {
 	var excelInfo request.ExcelImageRecordStatistics
 	_ = c.ShouldBindJSON(&excelInfo)
@@ -157,4 +173,4 @@ func (a *ImageRecordApi) ImageRecordStatisticsExport(c *gin.Context) {
 	}
 	c.Writer.Header().Add("success", "true")
 	c.File(filePath)
-}
+}

+ 2 - 0
model/levelMonitor/image_record.go

@@ -10,6 +10,7 @@ type ImageRecord struct {
 	Account     string               `json:"account"`      //账号
 	ImageBase64 string               `json:"image_base64"` //图片base64文本
 	Status      int                  `json:"status"`       //识别状态, 成功为1, 失败-1, 默认为2未识别
+	IsCanPay    int                  `json:"is_can_pay"`   //是否可付费, 1为可付费
 	Result      string               `json:"result"`       //识别结果
 	CreateDate  string               `json:"create_date"`  //创建日期
 	CreateTime  typeManage.LocalTime `json:"create_time"`
@@ -26,6 +27,7 @@ type ImageRecordResponse struct {
 	Account     string               `json:"account"`      //账号
 	ImageBase64 string               `json:"image_base64"` //图片base64文本
 	Status      int                  `json:"status"`       //识别状态, 成功为1, 失败-1, 默认为2未识别
+	IsCanPay    int                  `json:"is_can_pay"`   //是否可付费, 1为可付费
 	Result      string               `json:"result"`       //识别结果
 	CreateDate  string               `json:"create_date"`  //创建日期
 	CreateTime  typeManage.LocalTime `json:"create_time"`

+ 1 - 0
router/levelMonitor/image_record.go

@@ -19,6 +19,7 @@ func (r *ImageRecordRouter) InitImageRecordRouter(Router *gin.RouterGroup) {
 		imageRecordRouter.POST("createImageRecord", imageRecordApi.CreateImageRecord)                       //创建图片记录
 		imageRecordRouter.POST("uploadOrNot", imageRecordApi.UploadOrNot)                                   //询问是否上传图片
 		imageRecordRouter.POST("upLevel", imageRecordApi.UpLevel)                                           //上传等级
+		imageRecordRouter.POST("upCanPay", imageRecordApi.UpCanPay)                                         //上传等级
 	}
 	//imageRecordRouter1 := Router.Group("levelMonitor").Use(middleware.OperationRecord())
 	//{

+ 26 - 5
service/levelMonitor/image_record.go

@@ -28,7 +28,7 @@ type ImageRecordService struct {
 	cache cache.Cache
 }
 
-//创建图片记录
+// 创建图片记录
 func (s *ImageRecordService) CreateImageRecord(record levelMonitor.ImageRecord) (err error) {
 	//获取今日日期
 	date := time.Now().Format("2006-01-02")
@@ -56,6 +56,27 @@ func (s *ImageRecordService) CreateImageRecord(record levelMonitor.ImageRecord)
 	return
 }
 
+// 创建图片记录
+func (s *ImageRecordService) UpCanPay(record levelMonitor.ImageRecord) (err error) {
+	//获取今日日期
+	date := time.Now().Format("2006-01-02")
+	var entity levelMonitor.ImageRecord
+	//查找数据库是否存在此账号此游戏今日记录
+	err = global.GVA_DB.Model(&levelMonitor.ImageRecord{}).Where("task_id = ? and account = ? and create_date = ?", record.TaskId, record.Account, date).First(&entity).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return errors.New("记录不存在")
+	}
+	update := map[string]interface{}{
+		"is_can_pay": 1,
+	}
+	err = global.GVA_DB.Model(&levelMonitor.ImageRecord{}).Where("id", entity.Id).Updates(update).Error
+	if err != nil {
+		return err
+	}
+
+	return
+}
+
 func (s *ImageRecordService) CreateLevel(request levelRequest.CreateLevelRequest) (err error) {
 	//获取今日日期
 	date := time.Now().Format("2006-01-02")
@@ -127,7 +148,7 @@ func (s *ImageRecordService) UploadLeve(record levelMonitor.ImageRecord) (err er
 	return nil
 }
 
-//删除7日前的图片记录
+// 删除7日前的图片记录
 func (s *ImageRecordService) DeleteExpireImageRecord() {
 	markTime := time.Now().Add(-time.Hour * 48).Format("2006-01-02")
 	err := global.GVA_DB.Where("create_date < ?", markTime).Delete(&levelMonitor.ImageRecord{}).Error
@@ -440,7 +461,7 @@ func (s *ImageRecordService) CreateImageRecordStatistics(taskId int, imageRecord
 		Updates(imageRecordStatistics)
 }
 
-//获取7日统计数据
+// 获取7日统计数据
 func (s *ImageRecordService) GetWeekImageRecordStatistics(taskId int, createDate string) (dataList []levelMonitor.ImageRecordStatisticsResponse, err error) {
 	db := global.GVA_DB.Model(&levelMonitor.ImageRecordStatistics{})
 	db = db.Select("image_record_statistics.*, game_task.user, game_task.task_name")
@@ -452,7 +473,7 @@ func (s *ImageRecordService) GetWeekImageRecordStatistics(taskId int, createDate
 	return
 }
 
-//获取等级统计列表
+// 获取等级统计列表
 func (s *ImageRecordService) GetImageRecordStatisticsList(record levelRequest.ImageRecordStatisticsRequest, info request.PageInfo, order string, desc bool) (dataList []levelMonitor.ImageRecordStatisticsResponse, total int64, err error) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
@@ -508,7 +529,7 @@ func (s *ImageRecordService) GetImageRecordStatisticsList(record levelRequest.Im
 	return dataList, total, err
 }
 
-//导出等级统计列表
+// 导出等级统计列表
 func (s *ImageRecordService) ImageRecordStatisticsListExcel(infoList []levelMonitor.ImageRecordStatisticsResponse, filePath string) error {
 	excel := excelize.NewFile()
 	excel.SetSheetRow("Sheet1", "A1", &[]string{

+ 1 - 0
utils/verify.go

@@ -35,4 +35,5 @@ var (
 	ComputerTaskVerify       = Rules{"TaskId": {NotEmpty()}, "PcCode": {NotEmpty()}, "ConfId": {NotEmpty()}, "TaskName": {NotEmpty()}, "ConfName": {NotEmpty()}}                                //电脑任务校验
 	UrgentTaskVerify         = Rules{"TaskId": {NotEmpty()}, "PcCode": {NotEmpty()}}                                                                                                            //紧急任务校验
 	ImageRecordVerify        = Rules{"TaskId": {NotEmpty()}, "Account": {NotEmpty()}, "ImageBase64": {NotEmpty()}}                                                                              //图片记录验证
+	UpCanPayVerify           = Rules{"TaskId": {NotEmpty()}, "Account": {NotEmpty()}}                                                                                                           //图片记录验证
 )