Merge branch 'feature/diamond-detail' into 'master'

Feature/diamond detail

See merge request !25

domain/model/diamond_m/diamond.go

 package diamond_m
 
 import (
+	"fmt"
 	"git.hilo.cn/hilo-common/_const/enum/diamond_e"
 	"git.hilo.cn/hilo-common/domain"
 	"git.hilo.cn/hilo-common/resource/mysql"
@@ -37,6 +38,11 @@ type DiamondAccountDetail struct {
 	diamondAccount   *DiamondAccount `gorm:"-"`
 }
 
+func (DiamondAccountDetail) TableName() string {
+	month := time.Now().Format("200601")
+	return fmt.Sprintf("diamond_account_detail_%s", month)
+}
+
 // 粉钻详情
 type DiamondPinkAccountDetail struct {
 	mysql.Entity
@@ -107,7 +113,7 @@ func (diamondAccount *DiamondAccount) addDiamondAccountDetail(operateType diamon
 	var count int64
 	if diamondOperateSet.FrequencyDay == -1 {
 		if diamondOperateSet.FrequencyNum != -1 {
-			diamondAccount.Db.Model(&DiamondAccountDetail{}).Where(&DiamondAccountDetail{
+			diamondAccount.DB().Table(DiamondAccountDetail{}.TableName()).Where(&DiamondAccountDetail{
 				UserId:      diamondAccount.UserId,
 				OperateType: operateType,
 			}).Count(&count)
@@ -122,7 +128,7 @@ func (diamondAccount *DiamondAccount) addDiamondAccountDetail(operateType diamon
 			return nil, myerr.WrapErr(err)
 		}
 		//一天的次数
-		diamondAccount.Db.Model(&DiamondAccountDetail{}).Where(&DiamondAccountDetail{
+		diamondAccount.DB().Table(DiamondAccountDetail{}.TableName()).Where(&DiamondAccountDetail{
 			UserId:      diamondAccount.UserId,
 			OperateType: operateType,
 		}).Where("created_time >= ? ", beginTime).Count(&count)
@@ -130,7 +136,7 @@ func (diamondAccount *DiamondAccount) addDiamondAccountDetail(operateType diamon
 			return nil, bizerr.DiamondFrequency
 		}
 		//终极拦截，利用
-		diamondAccount.SetCheckUpdateCondition(" EXISTS (SELECT * from (SELECT COUNT(1)  as n from diamond_account_detail d where d.user_id = " + strconv.FormatUint(diamondAccount.UserId, 10) + " and d.operate_type = " + strconv.FormatUint(uint64(operateType), 10) + " and d.created_time >= from_unixtime(" + strconv.FormatInt(utils.GetZeroTime(time.Now()).Unix(), 10) + ")) t where t.n < " + strconv.Itoa(diamondOperateSet.FrequencyNum) + " )")
+		diamondAccount.SetCheckUpdateCondition(" EXISTS (SELECT * from (SELECT COUNT(1)  as n from " + DiamondAccountDetail{}.TableName() + " d where d.user_id = " + strconv.FormatUint(diamondAccount.UserId, 10) + " and d.operate_type = " + strconv.FormatUint(uint64(operateType), 10) + " and d.created_time >= from_unixtime(" + strconv.FormatInt(utils.GetZeroTime(time.Now()).Unix(), 10) + ")) t where t.n < " + strconv.Itoa(diamondOperateSet.FrequencyNum) + " )")
 	}
 
 	//-1,代表值无效，由参数给与

domain/model/diamond_m/repo.go

@@ -3,7 +3,6 @@ package diamond_m
 import (
 	"git.hilo.cn/hilo-common/resource/mysql"
 	"gorm.io/gorm"
-	"hilo-user/domain/model"
 	"hilo-user/myerr"
 	"strconv"
 )
@@ -32,7 +31,10 @@ func (diamondAccountDetail *DiamondAccountDetail) PersistentNoInTransactional()
 	}
 
 	//持久化diamondAccountDetail
-	if err := model.Persistent(diamondAccountDetail.Db, diamondAccountDetail); err != nil {
+	//if err := model.Persistent(diamondAccountDetail.Db, diamondAccountDetail); err != nil {
+	//	return myerr.WrapErr(err)
+	//}
+	if err := diamondAccountDetail.DB().Table(diamondAccountDetail.TableName()).Save(diamondAccountDetail).Error; err != nil {
 		return myerr.WrapErr(err)
 	}
 	//改变diamondAccount值