gdxz/hepa-calc-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增了首单立减金额

Browse Source
This commit is contained in:
wucongxing8150 2024-09-09 11:14:05 +08:00
parent 747a060c2d
commit bb17607133
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/controller/Public.go
View File

@ -246,7 +246,6 @@ func (b *Public) GetIndexData(c *gin.Context) {
date := time.Time(user.CreatedAt).Format("2006-01-02") date := time.Time(user.CreatedAt).Format("2006-01-02")
results[date]++ results[date]++
} }
} }
// 新增算算数 // 新增算算数

24
api/controller/SystemMember.go
View File

@ -157,18 +157,18 @@ func (b *SystemMember) PutSystemMember(c *gin.Context) {
} }
} }
// 首单优惠价格 // 首单立减金额
if req.FirstTimePrice != nil { if req.ReductionAmount != nil {
if systemMember.FirstTimePrice == nil { if systemMember.ReductionAmount == nil {
systemMemberData["first_time_price"] = req.FirstTimePrice systemMemberData["reduction_amount"] = req.ReductionAmount
} else { } else {
if *req.FirstTimePrice != *systemMember.FirstTimePrice { if *req.ReductionAmount != *systemMember.ReductionAmount {
systemMemberData["first_time_price"] = req.FirstTimePrice systemMemberData["reduction_amount"] = req.ReductionAmount
} }
} }
} else { } else {
if systemMember.FirstTimePrice != nil { if systemMember.ReductionAmount != nil {
systemMemberData["first_time_price"] = nil systemMemberData["reduction_amount"] = nil
} }
} }
@ -229,10 +229,10 @@ func (b *SystemMember) AddSystemMember(c *gin.Context) {
}() }()
systemMember := &model.SystemMember{ systemMember := &model.SystemMember{
MemberDays: req.MemberDays, MemberDays: req.MemberDays,
Price: req.Price, Price: req.Price,
DiscountPrice: req.DiscountPrice, DiscountPrice: req.DiscountPrice,
FirstTimePrice: req.FirstTimePrice, ReductionAmount: req.ReductionAmount,
} }
// 处理优惠截止时间 // 处理优惠截止时间

6
api/dto/SystemMember.go
View File

@ -12,7 +12,7 @@ type SystemMemberDto struct {
Price float64 `json:"price"` // 价格（原价） Price float64 `json:"price"` // 价格（原价）
DiscountPrice *float64 `json:"discount_price"` // 优惠价格 DiscountPrice *float64 `json:"discount_price"` // 优惠价格
DiscountEndTime *model.LocalTime `json:"discount_end_time"` // 优惠截止时间 DiscountEndTime *model.LocalTime `json:"discount_end_time"` // 优惠截止时间
FirstTimePrice *float64 `json:"first_time_price"` // 首次购买价格 ReductionAmount *float64 `json:"reduction_amount"` // 立减金额
CreatedAt model.LocalTime `json:"created_at"` // 创建时间 CreatedAt model.LocalTime `json:"created_at"` // 创建时间
UpdatedAt model.LocalTime `json:"updated_at"` // 更新时间 UpdatedAt model.LocalTime `json:"updated_at"` // 更新时间
} }
@ -30,7 +30,7 @@ func GetSystemMemberListDto(m []*model.SystemMember) []*SystemMemberDto {
Price: v.Price, Price: v.Price,
DiscountPrice: v.DiscountPrice, DiscountPrice: v.DiscountPrice,
DiscountEndTime: v.DiscountEndTime, DiscountEndTime: v.DiscountEndTime,
FirstTimePrice: v.FirstTimePrice, ReductionAmount: v.ReductionAmount,
CreatedAt: v.CreatedAt, CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt, UpdatedAt: v.UpdatedAt,
} }
@ -51,7 +51,7 @@ func GetSystemMemberDto(m *model.SystemMember) *SystemMemberDto {
Price: m.Price, Price: m.Price,
DiscountPrice: m.DiscountPrice, DiscountPrice: m.DiscountPrice,
DiscountEndTime: m.DiscountEndTime, DiscountEndTime: m.DiscountEndTime,
FirstTimePrice: m.FirstTimePrice, ReductionAmount: m.ReductionAmount,
CreatedAt: m.CreatedAt, CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt, UpdatedAt: m.UpdatedAt,
} }

2
api/model/SystemMember.go
View File

@ -13,7 +13,7 @@ type SystemMember struct {
Price float64 `gorm:"column:price;type:decimal(10,2);default:0.00;comment:价格（原价）" json:"price"` Price float64 `gorm:"column:price;type:decimal(10,2);default:0.00;comment:价格（原价）" json:"price"`
DiscountPrice *float64 `gorm:"column:discount_price;type:decimal(10,2);comment:优惠价格" json:"discount_price"` DiscountPrice *float64 `gorm:"column:discount_price;type:decimal(10,2);comment:优惠价格" json:"discount_price"`
DiscountEndTime *LocalTime `gorm:"column:discount_end_time;type:datetime;comment:优惠截止时间" json:"discount_end_time"` DiscountEndTime *LocalTime `gorm:"column:discount_end_time;type:datetime;comment:优惠截止时间" json:"discount_end_time"`
FirstTimePrice *float64 `gorm:"column:first_time_price;type:decimal(10,2);comment:首次购买价格" json:"first_time_price"` ReductionAmount *float64 `gorm:"column:reduction_amount;type:decimal(10,2);comment:首单立减金额" json:"reduction_amount"`
Model Model
} }

4
api/requests/SystemMember.go
View File

@ -11,7 +11,7 @@ type PutSystemMember struct {
Price float64 `json:"price" form:"price" label:"价格（原价）" validate:"required,numeric,min=0"` Price float64 `json:"price" form:"price" label:"价格（原价）" validate:"required,numeric,min=0"`
DiscountPrice *float64 `json:"discount_price" form:"discount_price" label:"优惠价格" validate:"omitempty,numeric,min=0"` DiscountPrice *float64 `json:"discount_price" form:"discount_price" label:"优惠价格" validate:"omitempty,numeric,min=0"`
DiscountEndTime *string `json:"discount_end_time" form:"discount_end_time" label:"优惠截止时间"` DiscountEndTime *string `json:"discount_end_time" form:"discount_end_time" label:"优惠截止时间"`
FirstTimePrice *float64 `json:"first_time_price" form:"first_time_price" label:"首次购买价格"` ReductionAmount *float64 `json:"reduction_amount" form:"reduction_amount" label:"首单立减金额"`
} }
// AddSystemMember 新增会员配置 // AddSystemMember 新增会员配置
@ -20,5 +20,5 @@ type AddSystemMember struct {
Price float64 `json:"price" form:"price" label:"价格（原价）" validate:"required,numeric,min=0"` Price float64 `json:"price" form:"price" label:"价格（原价）" validate:"required,numeric,min=0"`
DiscountPrice *float64 `json:"discount_price" form:"discount_price" label:"优惠价格" validate:"omitempty,numeric,min=0"` DiscountPrice *float64 `json:"discount_price" form:"discount_price" label:"优惠价格" validate:"omitempty,numeric,min=0"`
DiscountEndTime *string `json:"discount_end_time" form:"discount_end_time" label:"优惠截止时间"` DiscountEndTime *string `json:"discount_end_time" form:"discount_end_time" label:"优惠截止时间"`
FirstTimePrice *float64 `json:"first_time_price" form:"first_time_price" label:"首次购买价格"` ReductionAmount *float64 `json:"reduction_amount" form:"reduction_amount" label:"首单立减金额"`
} }