1、用户余额分页和排序修改
This commit is contained in:
@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/gin-gonic/gin/binding"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
||||||
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
||||||
@ -32,7 +33,7 @@ func (e MemberBalance) GetPage(c *gin.Context) {
|
|||||||
s := service.MemberBalance{}
|
s := service.MemberBalance{}
|
||||||
err := e.MakeContext(c).
|
err := e.MakeContext(c).
|
||||||
MakeOrm().
|
MakeOrm().
|
||||||
Bind(&req).
|
Bind(&req, binding.Form, binding.Query).
|
||||||
MakeService(&s.Service).
|
MakeService(&s.Service).
|
||||||
Errors
|
Errors
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import (
|
|||||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
||||||
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
||||||
|
"github.com/shopspring/decimal"
|
||||||
|
|
||||||
"go-admin/app/admin/models"
|
"go-admin/app/admin/models"
|
||||||
"go-admin/app/admin/service"
|
"go-admin/app/admin/service"
|
||||||
@ -197,10 +198,12 @@ func (e SmsPhone) Delete(c *gin.Context) {
|
|||||||
func (e SmsPhone) GetNumber(c *gin.Context) {
|
func (e SmsPhone) GetNumber(c *gin.Context) {
|
||||||
req := dto.GetNumberReq{}
|
req := dto.GetNumberReq{}
|
||||||
s := service.SmsPhone{}
|
s := service.SmsPhone{}
|
||||||
|
servicesService := service.SmsServices{}
|
||||||
err := e.MakeContext(c).
|
err := e.MakeContext(c).
|
||||||
MakeOrm().
|
MakeOrm().
|
||||||
Bind(&req).
|
Bind(&req).
|
||||||
MakeService(&s.Service).
|
MakeService(&s.Service).
|
||||||
|
MakeService(&servicesService.Service).
|
||||||
Errors
|
Errors
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
@ -214,11 +217,26 @@ func (e SmsPhone) GetNumber(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var balance decimal.Decimal
|
||||||
|
code := statuscode.Success
|
||||||
userId := user.GetUserId(c)
|
userId := user.GetUserId(c)
|
||||||
balance, code := s.GetNumber(&req, userId)
|
smsService, err := servicesService.GetByCode(req.ServiceCode)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
code = statuscode.SmsServiceUnavailable
|
||||||
|
} else if smsService.Status == 2 {
|
||||||
|
code = statuscode.SmsServiceUnavailable
|
||||||
|
} else {
|
||||||
|
balance, code = s.GetNumber(&req, userId)
|
||||||
|
}
|
||||||
|
|
||||||
if code != statuscode.Success {
|
if code != statuscode.Success {
|
||||||
|
if code == statuscode.SmsServiceUnavailable {
|
||||||
|
e.Error(code, nil, statuscode.GetMsg(code, "zh", smsService.Name))
|
||||||
|
} else {
|
||||||
e.Error(code, nil, statuscode.GetMsg(code, "zh"))
|
e.Error(code, nil, statuscode.GetMsg(code, "zh"))
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -10,6 +10,7 @@ type SmsServices struct {
|
|||||||
Name string `json:"name" gorm:"type:varchar(255);comment:服务名称"`
|
Name string `json:"name" gorm:"type:varchar(255);comment:服务名称"`
|
||||||
Code string `json:"code" gorm:"type:varchar(50);comment:编码"`
|
Code string `json:"code" gorm:"type:varchar(50);comment:编码"`
|
||||||
ExpirationMinutes int `json:"expirationMinutes" gorm:"type:int;comment:过期时间(分钟)"`
|
ExpirationMinutes int `json:"expirationMinutes" gorm:"type:int;comment:过期时间(分钟)"`
|
||||||
|
Status int `json:"status" gorm:"type:tinyint;comment:状态 1-启用 2-禁用"`
|
||||||
models.ModelTime
|
models.ModelTime
|
||||||
models.ControlBy
|
models.ControlBy
|
||||||
}
|
}
|
||||||
|
|||||||
@ -87,6 +87,7 @@ func (s *SmsServicesDeleteReq) GetId() interface{} {
|
|||||||
type SmsServicesGetListResp struct {
|
type SmsServicesGetListResp struct {
|
||||||
Name string `json:"name" comment:"服务名称"`
|
Name string `json:"name" comment:"服务名称"`
|
||||||
Code string `json:"code" comment:"编码"`
|
Code string `json:"code" comment:"编码"`
|
||||||
|
Status int `json:"status" comment:"状态"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SmsGetPriceReq struct {
|
type SmsGetPriceReq struct {
|
||||||
|
|||||||
@ -146,6 +146,10 @@ func (e *SmsPhone) GetNumber(req *dto.GetNumberReq, userId int) (decimal.Decimal
|
|||||||
configReq := dto.SysConfigByKeyReq{}
|
configReq := dto.SysConfigByKeyReq{}
|
||||||
configService := SysConfig{Service: e.Service}
|
configService := SysConfig{Service: e.Service}
|
||||||
|
|
||||||
|
if strings.ToLower(req.ServiceCode) != "wa" {
|
||||||
|
return decimal.Zero, statuscode.SmsServiceUnavailable
|
||||||
|
}
|
||||||
|
|
||||||
if req.Type == 0 {
|
if req.Type == 0 {
|
||||||
configReq.ConfigKey = "number_fee_short_term"
|
configReq.ConfigKey = "number_fee_short_term"
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -55,6 +55,7 @@ func (e SmsServices) GetList(resp *[]dto.SmsServicesGetListResp) error {
|
|||||||
respItem := dto.SmsServicesGetListResp{
|
respItem := dto.SmsServicesGetListResp{
|
||||||
Name: item.Name,
|
Name: item.Name,
|
||||||
Code: item.Code,
|
Code: item.Code,
|
||||||
|
Status: item.Status,
|
||||||
}
|
}
|
||||||
*resp = append(*resp, respItem)
|
*resp = append(*resp, respItem)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
package statuscode
|
package statuscode
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
var StatusCodeZh = map[int]string{
|
var StatusCodeZh = map[int]string{
|
||||||
Success: "成功",
|
Success: "成功",
|
||||||
AccountExisted: "账号已存在",
|
AccountExisted: "账号已存在",
|
||||||
@ -23,6 +25,7 @@ var StatusCodeZh = map[int]string{
|
|||||||
SmsNotExisted: "号码不存在",
|
SmsNotExisted: "号码不存在",
|
||||||
SmsNotExpired: "号码未过期无法删除",
|
SmsNotExpired: "号码未过期无法删除",
|
||||||
SmsNotAutoRenew: "短效号码无法自动续期",
|
SmsNotAutoRenew: "短效号码无法自动续期",
|
||||||
|
SmsServiceUnavailable: "%s服务暂不可用",
|
||||||
}
|
}
|
||||||
|
|
||||||
var StatusCodeEn = map[int]string{
|
var StatusCodeEn = map[int]string{
|
||||||
@ -48,14 +51,27 @@ var StatusCodeEn = map[int]string{
|
|||||||
SmsNotExisted: "number not exist",
|
SmsNotExisted: "number not exist",
|
||||||
SmsNotExpired: "number not expired, can not delete",
|
SmsNotExpired: "number not expired, can not delete",
|
||||||
SmsNotAutoRenew: "num can not auto renew",
|
SmsNotAutoRenew: "num can not auto renew",
|
||||||
|
SmsServiceUnavailable: "%s service unavailable",
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMsg(code int, lang string) string {
|
// GetMsg 获取状态码对应的消息
|
||||||
|
// code 状态码
|
||||||
|
// lang 语言
|
||||||
|
// args 格式化参数
|
||||||
|
func GetMsg(code int, lang string, args ...interface{}) string {
|
||||||
|
var content string
|
||||||
|
|
||||||
if lang == "zh" {
|
if lang == "zh" {
|
||||||
return StatusCodeZh[code]
|
content = StatusCodeZh[code]
|
||||||
} else {
|
} else {
|
||||||
return StatusCodeEn[code]
|
content = StatusCodeEn[code]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(args) > 0 {
|
||||||
|
content = fmt.Sprintf(content, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
return content
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -107,4 +123,6 @@ const (
|
|||||||
SmsNotExpired = 20019
|
SmsNotExpired = 20019
|
||||||
//短效号码无法自动续期
|
//短效号码无法自动续期
|
||||||
SmsNotAutoRenew = 20020
|
SmsNotAutoRenew = 20020
|
||||||
|
//短信验证码_服务暂不可用
|
||||||
|
SmsServiceUnavailable = 20021
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user