|
|
|
@ -60,6 +60,8 @@ type priceSub struct {
|
|
|
|
|
Commission decimal.Decimal `gorm:"column:commission" json:"commission"`
|
|
|
|
|
Ferme decimal.Decimal `json:"ferme"`
|
|
|
|
|
SalePrice decimal.Decimal `json:"sale_price"`
|
|
|
|
|
Min uint `json:"min"`
|
|
|
|
|
Limit uint `json:"limit"`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type allPrice struct {
|
|
|
|
@ -362,12 +364,16 @@ func QueryGoodsDetailNew(c *gin.Context) {
|
|
|
|
|
DiscountPrice: minAllPrice.DiscountPrice,
|
|
|
|
|
Commission: minCommission1.Add(minCommission2).Add(minCommission3),
|
|
|
|
|
SalePrice: minAllPrice.SalePrice,
|
|
|
|
|
Min: minAllPrice.Min,
|
|
|
|
|
Limit: minAllPrice.Limit,
|
|
|
|
|
},
|
|
|
|
|
priceSub{
|
|
|
|
|
OriginalPrice: maxAllPrice.OriginalPrice,
|
|
|
|
|
DiscountPrice: maxAllPrice.DiscountPrice,
|
|
|
|
|
Commission: maxCommission1.Add(maxCommission2).Add(maxCommission3),
|
|
|
|
|
SalePrice: minAllPrice.SalePrice,
|
|
|
|
|
SalePrice: maxAllPrice.SalePrice,
|
|
|
|
|
Min: maxAllPrice.Min,
|
|
|
|
|
Limit: minAllPrice.Limit,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
//if summary.IsFerme == goods2.RecookGoodsInfoIsFermeTrue {
|
|
|
|
|