diff --git a/Dockerfile b/Dockerfile index 1fdaddf..4d75b3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ WORKDIR /app 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 COPY --from=builder /build/bin/platform_linux_amd64 /app/platform diff --git a/web/handlers/resource.go b/web/handlers/resource.go index 6cc86f2..a307b66 100644 --- a/web/handlers/resource.go +++ b/web/handlers/resource.go @@ -797,10 +797,7 @@ type CreateResourceReq struct { // ResourcePrice 套餐价格 func ResourcePrice(c *fiber.Ctx) error { // 检查权限 - _, err := auth.GetAuthCtx(c).PermitSecretClient() - if err != nil { - return err - } + ac := auth.GetAuthCtx(c) // 解析请求参数 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 { return err } diff --git a/web/services/resource.go b/web/services/resource.go index 966b449..6c0e1b8 100644 --- a/web/services/resource.go +++ b/web/services/resource.go @@ -172,7 +172,7 @@ func (s *resourceService) CalcPrice(skuCode string, count int32, user *m.User, c } uDiscountRate := uDiscount.Rate() - if uDiscountRate.Cmp(discountRate) > 0 { + if uDiscountRate.Cmp(discountRate) < 0 { discountRate = uDiscountRate discount = uDiscount }