修复套餐价格问题
This commit is contained in:
@@ -19,7 +19,7 @@ WORKDIR /app
|
|||||||
|
|
||||||
ENV TZ=Asia/Shanghai
|
ENV TZ=Asia/Shanghai
|
||||||
|
|
||||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
||||||
RUN apk add --no-cache ca-certificates tzdata
|
RUN apk add --no-cache ca-certificates tzdata
|
||||||
|
|
||||||
COPY --from=builder /build/bin/platform_linux_amd64 /app/platform
|
COPY --from=builder /build/bin/platform_linux_amd64 /app/platform
|
||||||
|
|||||||
@@ -797,10 +797,7 @@ type CreateResourceReq struct {
|
|||||||
// ResourcePrice 套餐价格
|
// ResourcePrice 套餐价格
|
||||||
func ResourcePrice(c *fiber.Ctx) error {
|
func ResourcePrice(c *fiber.Ctx) error {
|
||||||
// 检查权限
|
// 检查权限
|
||||||
_, err := auth.GetAuthCtx(c).PermitSecretClient()
|
ac := auth.GetAuthCtx(c)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// 解析请求参数
|
// 解析请求参数
|
||||||
var req = new(CreateResourceReq)
|
var req = new(CreateResourceReq)
|
||||||
@@ -809,7 +806,7 @@ func ResourcePrice(c *fiber.Ctx) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取套餐价格
|
// 获取套餐价格
|
||||||
detail, err := req.TradeDetail(nil)
|
detail, err := req.TradeDetail(ac.User)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ func (s *resourceService) CalcPrice(skuCode string, count int32, user *m.User, c
|
|||||||
}
|
}
|
||||||
|
|
||||||
uDiscountRate := uDiscount.Rate()
|
uDiscountRate := uDiscount.Rate()
|
||||||
if uDiscountRate.Cmp(discountRate) > 0 {
|
if uDiscountRate.Cmp(discountRate) < 0 {
|
||||||
discountRate = uDiscountRate
|
discountRate = uDiscountRate
|
||||||
discount = uDiscount
|
discount = uDiscount
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user