Merge branch 'feature/v4.8.81_ws' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.8.81_ws

src/jfw/modules/publicapply/src/userbase/entity/entity.go

@@ -26,7 +26,7 @@ const (
 	RedisPoly                = "poly"     // 查白名单用户用的redis
 	WhitelistRedisKey        = "white_%s" // 白名单用户用的redis key
 	TabelOriginalPowerRecord = "original_power_record"
-	TableOriginalUserAccount = "original_user_account" // 用户每个月使用的查看原文次数表
+	TableOriginalUserLedger  = "original_user_ledger" // 用户每个月使用的查看原文次数表
 )
 
 type UserInfo struct {
@@ -445,7 +445,7 @@ func (o *OriginalPower) CountRecord() int {
 	// UseUserAccountTime 此时间之后使用新表统计数据
 	if initjson.UseUserAccountTime.Before(time.Now()) {
 		// 查询条数
-		qCount := fmt.Sprintf("select usage_count from %s where position_id=? %s", TableOriginalUserAccount, where)
+		qCount := fmt.Sprintf("select usage_count from %s where position_id=? %s", TableOriginalUserLedger, where)
 		countRs := db.Mysql.SelectBySql(qCount, o.PositionId)
 		// 已经有数据
 		if countRs != nil && len(*countRs) > 0 {
@@ -517,19 +517,19 @@ func (o *OriginalPower) IncOriginalUserAccount() {
 		where = fmt.Sprintf(`and create_time >="%s"`, timeStart)
 	}
 	// 查询条数
-	qCount := fmt.Sprintf("select id from %s where position_id=? %s", TableOriginalUserAccount, where)
+	qCount := fmt.Sprintf("select id from %s where position_id=? %s", TableOriginalUserLedger, where)
 	countRs := db.Mysql.SelectBySql(qCount, o.PositionId)
 	if countRs != nil && len(*countRs) > 0 {
 		id := (*countRs)[0]["id"]
 		// 存在则执行更新
-		_, err := db.Mysql.ExecBySql(fmt.Sprintf("update %s set usage_count=usage_count+1 where id=?", TableOriginalUserAccount), id)
+		_, err := db.Mysql.ExecBySql(fmt.Sprintf("update %s set usage_count=usage_count+1 where id=?", TableOriginalUserLedger), id)
 		if err != nil {
 			log.Println("更新条数信息失败：", err, o.Phone, o.UserId, o.Client, o.PositionId)
 			return
 		}
 	} else {
 		// 不存在则插入
-		db.Mysql.Insert(TableOriginalUserAccount, map[string]interface{}{
+		db.Mysql.Insert(TableOriginalUserLedger, map[string]interface{}{
 			"user_id":     o.UserId,
 			"position_id": o.PositionId,
 			"phone":       o.Phone,