diff --git a/go.mod b/go.mod index c2696e38..7e12ec36 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/streadway/amqp v1.1.0 - github.com/stripe/stripe-go/v74 v74.30.0 + github.com/stripe/stripe-go/v75 v75.7.0 github.com/zeromicro/go-zero v1.5.4 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 golang.org/x/oauth2 v0.10.0 diff --git a/go.sum b/go.sum index 5e518b03..616fc241 100644 --- a/go.sum +++ b/go.sum @@ -83,7 +83,6 @@ github.com/aws/aws-sdk-go v1.44.295 h1:SGjU1+MqttXfRiWHD6WU0DRhaanJgAFY+xIhEaugV github.com/aws/aws-sdk-go v1.44.295/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -184,7 +183,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -346,7 +344,6 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -359,7 +356,6 @@ github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0b github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= @@ -438,7 +434,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nacos-group/nacos-sdk-go/v2 v2.2.3 h1:sUQx4f1bXDeeOOEQZjGAitzxYApbYY9fVDbxVCaBW+I= github.com/nacos-group/nacos-sdk-go/v2 v2.2.3/go.mod h1:UL4U89WYdnyajgKJUMpuT1Rr6iNmbjrxOO40JRgtA00= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= @@ -553,10 +548,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stripe/stripe-go/v74 v74.26.0 h1:enbhLtjKGWvJKcGM0f2CazqFSXzpHXcQ42nG2PNsWK0= -github.com/stripe/stripe-go/v74 v74.26.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw= -github.com/stripe/stripe-go/v74 v74.30.0 h1:0Kf0KkeFnY7iRhOwvTerX0Ia1BRw+eV1CVJ51mGYAUY= -github.com/stripe/stripe-go/v74 v74.30.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw= +github.com/stripe/stripe-go/v75 v75.7.0 h1:Zk7trlj0kClZOwnpjGz7FgVQRBI0Koi28/eaNATgAs0= +github.com/stripe/stripe-go/v75 v75.7.0/go.mod h1:wT44gah+eCY8Z0aSpY/vQlYYbicU9uUAbAqdaUxxDqE= github.com/tidwall/gjson v1.12.0 h1:61wEp/qfvFnqKH/WCI3M8HuRut+mHT6Mr82QrFmM2SY= github.com/tidwall/gjson v1.12.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= diff --git a/model/gmodel/fs_product_model3d_logic.go b/model/gmodel/fs_product_model3d_logic.go index 74ffe4e6..f7a7f3b3 100755 --- a/model/gmodel/fs_product_model3d_logic.go +++ b/model/gmodel/fs_product_model3d_logic.go @@ -4,6 +4,18 @@ import ( "context" ) +// 阶梯价结构 +type StepPriceJsonStruct struct { + PriceRange []struct { + Label string `json:"label"` + Price int64 `json:"price"` + EndQuantity int64 `json:"end_quantity"` + StartQuantity int64 `json:"start_quantity"` + } `json:"price_range"` + MinBuyUnitsNum int64 `json:"min_buy_units_num"` + StepBuyUnitsNum int64 `json:"step_buy_units_num"` +} + func (d *FsProductModel3dModel) FindOne(ctx context.Context, id int64, fields ...string) (resp *FsProductModel3d, err error) { db := d.db.WithContext(ctx).Model(&FsProductModel3d{}).Where("`id` = ? ", id) if len(fields) > 0 { @@ -120,3 +132,14 @@ func (d *FsProductModel3dModel) GetOneBySizeIdTag(ctx context.Context, sizeId in err = db.Take(&resp).Error return resp, err } + +func (d *FsProductModel3dModel) GetAllByProductIdTag(ctx context.Context, productId int64, tag int64, fields ...string) (resp []FsProductModel3d, err error) { + db := d.db.WithContext(ctx).Model(&FsProductModel3d{}). + Where("`product_id` = ? and `tag` = ? and `status` = ?", productId, tag, 1). + Order("sort DESC") + if len(fields) != 0 { + db = db.Select(fields[0]) + } + err = db.Find(&resp).Error + return resp, err +} diff --git a/server/pay/internal/logic/stripewebhooklogic.go b/server/pay/internal/logic/stripewebhooklogic.go index 70fe699c..e061cb32 100644 --- a/server/pay/internal/logic/stripewebhooklogic.go +++ b/server/pay/internal/logic/stripewebhooklogic.go @@ -16,8 +16,8 @@ import ( "fusenapi/server/pay/internal/svc" "fusenapi/server/pay/internal/types" - "github.com/stripe/stripe-go/v74" - "github.com/stripe/stripe-go/v74/webhook" + "github.com/stripe/stripe-go/v75" + "github.com/stripe/stripe-go/v75/webhook" "github.com/zeromicro/go-zero/core/logc" "github.com/zeromicro/go-zero/core/logx" ) @@ -57,12 +57,15 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo logc.Errorf(l.ctx, "StripeWebhookLogic StripeWebhook Unmarshal err:%v", err) return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail") } + // fmt.Println(req) + // fmt.Println(event) endpointSecret := l.svcCtx.Config.PayConfig.Stripe.EndpointSecret signatureHeader := req.StripeSignature + fmt.Println(endpointSecret) event, err := webhook.ConstructEvent(req.Payload, signatureHeader, endpointSecret) if err != nil { - logx.Error(err) + logc.Errorf(l.ctx, "webhook.ConstructEvent err:%v", err) return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "Webhook signature verification failed") } @@ -70,24 +73,30 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo var payMethod = int64(constants.PAYMETHOD_STRIPE) var nowTime = time.Now().UTC() var eventData = []byte(event.Data.Raw) + eventType := string(event.Type) l.HandlePayEventCreate(&gmodel.FsOrderTradeEvent{ PayMethod: &payMethod, EventId: &event.ID, - EventType: &event.Type, + EventType: &eventType, EventData: &eventData, Ctime: &nowTime, }) // Unmarshal the event data into an appropriate struct depending on its Type + fmt.Println("事件类型", event.Type) switch event.Type { case "charge.succeeded": - // var charge stripe.Charge - // err := json.Unmarshal(event.Data.Raw, &charge) - // if err != nil { - // logx.Error(err) - // return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type charge.succeeded") - // } - + var charge stripe.Charge + err := json.Unmarshal(event.Data.Raw, &charge) + if err != nil { + logx.Errorf("err：%+v，desc：%s", err, "pay notify Unmarshal fail event.Type charge.succeeded") + return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type charge.succeeded") + } + err = l.HandleChargeSucceeded(&charge, event.ID) + if err != nil { + logx.Errorf("err：%+v，desc：%s", err, "pay notify handle payment_intent.succeeded") + return resp.SetStatusWithMessage(basic.CodePaybackNotOk, "pay notify handle payment_intent.succeeded") + } case "checkout.session.completed": // checkout checkout.session.completed 处理逻辑 // var session stripe.CheckoutSession @@ -102,24 +111,24 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo // return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "checkout.session.completed fail") // } case "payment_intent.succeeded": - var paymentIntent stripe.PaymentIntent - err := json.Unmarshal(event.Data.Raw, &paymentIntent) - if err != nil { - logx.Errorf("err：%+v，desc：%s", err, "pay notify Unmarshal fail event.Type payment_intent.succeeded") - return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type payment_intent.succeeded") - } - err = l.HandlePaymentIntentSucceeded(&paymentIntent, event.ID) - if err != nil { - logx.Errorf("err：%+v，desc：%s", err, "pay notify handle payment_intent.succeeded") - return resp.SetStatusWithMessage(basic.CodePaybackNotOk, "pay notify handle payment_intent.succeeded") - } + // var paymentIntent stripe.PaymentIntent + // err := json.Unmarshal(event.Data.Raw, &paymentIntent) + // if err != nil { + // logx.Errorf("err：%+v，desc：%s", err, "pay notify Unmarshal fail event.Type payment_intent.succeeded") + // return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type payment_intent.succeeded") + // } + // err = l.HandlePaymentIntentSucceeded(&paymentIntent, event.ID) + // if err != nil { + // logx.Errorf("err：%+v，desc：%s", err, "pay notify handle payment_intent.succeeded") + // return resp.SetStatusWithMessage(basic.CodePaybackNotOk, "pay notify handle payment_intent.succeeded") + // } case "payment_method.attached": - var paymentMethod stripe.PaymentMethod - err := json.Unmarshal(event.Data.Raw, &paymentMethod) - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type payment_method.attached") - } + // var paymentMethod stripe.PaymentMethod + // err := json.Unmarshal(event.Data.Raw, &paymentMethod) + // if err != nil { + // logx.Error(err) + // return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type payment_method.attached") + // } case "charge.refunded": var chargeRefunded stripe.Charge err := json.Unmarshal(event.Data.Raw, &chargeRefunded) @@ -232,11 +241,10 @@ func (l *StripeWebhookLogic) handlePaymentSessionCompleted(sessionId string, tra } // 付款成功 -func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.PaymentIntent, eventId string) error { - fmt.Println(paymentIntent) +func (l *StripeWebhookLogic) HandleChargeSucceeded(charge *stripe.Charge, eventId string) error { // 支付成功 - if paymentIntent.Status == "succeeded" { - model, ok := paymentIntent.Metadata["model"] + if charge.Status == "succeeded" { + model, ok := charge.Metadata["model"] if !ok { err := errors.New("model is empty") logc.Errorf(l.ctx, "PaymentSuccessful failed param, eventId:%s,err:%v", eventId, err) @@ -247,7 +255,7 @@ func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe. res, err := l.svcCtx.Repositories.NewOrder.PaymentSuccessful(l.ctx, &repositories.PaymentSuccessfulReq{ EventId: eventId, PaymentMethod: 1, - PaymentIntent: paymentIntent, + Charge: charge, }) if err != nil { return err diff --git a/server/product/internal/logic/getpricebypidlogic.go b/server/product/internal/logic/getpricebypidlogic.go index 025a9c33..546533c5 100644 --- a/server/product/internal/logic/getpricebypidlogic.go +++ b/server/product/internal/logic/getpricebypidlogic.go @@ -34,7 +34,6 @@ func NewGetPriceByPidLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get svcCtx: svcCtx, } } - func (l *GetPriceByPidLogic) GetPriceByPid(req *types.GetPriceByPidReq, userinfo *auth.UserInfo) (resp *basic.Response) { req.Pid = strings.Trim(req.Pid, " ") if req.Pid == "" { diff --git a/server/product/internal/logic/getsizebyproductlogic.go b/server/product/internal/logic/getsizebyproductlogic.go index f8e56a96..e6076bac 100644 --- a/server/product/internal/logic/getsizebyproductlogic.go +++ b/server/product/internal/logic/getsizebyproductlogic.go @@ -1,16 +1,10 @@ package logic import ( - "context" - "errors" - "fmt" - "fusenapi/constants" - "fusenapi/model/gmodel" "fusenapi/utils/auth" "fusenapi/utils/basic" - "fusenapi/utils/format" - "fusenapi/utils/step_price" - "strings" + + "context" "fusenapi/server/product/internal/svc" "fusenapi/server/product/internal/types" @@ -32,157 +26,18 @@ func NewGetSizeByProductLogic(ctx context.Context, svcCtx *svc.ServiceContext) * } } -// 获取分类下的产品以及尺寸 +// 处理进入前逻辑w,r +// func (l *GetSizeByProductLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) { +// } + func (l *GetSizeByProductLogic) GetSizeByProduct(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) { - if userinfo.GetIdType() != auth.IDTYPE_User { - return resp.SetStatusWithMessage(basic.CodeUnAuth, "please sign in first") - } - //获取所有网站目录 - tagsModel := gmodel.NewFsTagsModel(l.svcCtx.MysqlConn) - tagsList, err := tagsModel.GetAllByLevel(l.ctx, constants.TYPE_WEBSITE) - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get website tags") - } - if len(tagsList) == 0 { - return resp.SetStatusWithMessage(basic.CodeOK, "tag list is null") - } - tagIds := make([]int64, 0, len(tagsList)) - for _, v := range tagsList { - tagIds = append(tagIds, v.Id) - } - //获取这些类型的产品 - productModel := gmodel.NewFsProductModel(l.svcCtx.MysqlConn) - productList, err := productModel.GetProductListByIds(l.ctx, tagIds, "sort-desc") - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get tag product list") - } - productIds := make([]int64, 0, len(productList)) - for _, v := range productList { - productIds = append(productIds, v.Id) - } - productSizeModel := gmodel.NewFsProductSizeModel(l.svcCtx.MysqlConn) - productSizeList, err := productSizeModel.GetAllByProductIds(l.ctx, productIds, "sort DESC") - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product size list") - } - sizeIds := make([]int64, 0, len(productSizeList)) - for _, v := range productSizeList { - sizeIds = append(sizeIds, v.Id) - } - //获取价格列表 - productPriceModel := gmodel.NewFsProductPriceModel(l.svcCtx.MysqlConn) - productPriceList, err := productPriceModel.GetPriceListByProductIdsSizeIds(l.ctx, productIds, sizeIds) - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product proce list") - } - mapProductPrice := make(map[string]gmodel.FsProductPrice) - for _, v := range productPriceList { - mapProductPrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = v - } - //组装返回 - list := make([]types.GetSizeByProductRsp, 0, len(tagsList)) - for _, tag := range tagsList { - //获取第一层子类 - firstChildrenList, err := l.GetFirstChildrenList(tag, productList, productSizeList, mapProductPrice) - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get first level children list") - } - data := types.GetSizeByProductRsp{ - Id: tag.Id, - Name: *tag.Title, - Children: firstChildrenList, - } - list = append(list, data) - } - return resp.SetStatusWithMessage(basic.CodeOK, "success", list) + // 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) + // userinfo 传入值时, 一定不为null + + return resp.SetStatus(basic.CodeOK) } -// 第一层子层 -func (l *GetSizeByProductLogic) GetFirstChildrenList(tag gmodel.FsTags, productList []gmodel.FsProduct, productSizeList []gmodel.FsProductSize, mapProductPrice map[string]gmodel.FsProductPrice) (childrenList []types.Children, err error) { - childrenList = make([]types.Children, 0, len(productList)) - for _, product := range productList { - if *product.Type != tag.Id { - continue - } - childrenObjList, err := l.GetSecondChildrenList(product, productSizeList, mapProductPrice) - if err != nil { - return nil, err - } - //获取第二层子类 - data := types.Children{ - Id: product.Id, - Name: *product.Title, - Cycle: int(*product.DeliveryDays + *product.ProduceDays), - ChildrenList: childrenObjList, - } - childrenList = append(childrenList, data) - } - return -} - -// 第2层子层 -func (l *GetSizeByProductLogic) GetSecondChildrenList(product gmodel.FsProduct, productSizeList []gmodel.FsProductSize, mapProductPrice map[string]gmodel.FsProductPrice) (childrenObjList []types.ChildrenObj, err error) { - childrenObjList = make([]types.ChildrenObj, 0, len(productSizeList)) - for _, productSize := range productSizeList { - if product.Id != *productSize.ProductId { - continue - } - priceList := make([]types.PriceObj, 0, len(productSizeList)) - price, ok := mapProductPrice[fmt.Sprintf("%d_%d", *productSize.ProductId, productSize.Id)] - //无对应尺寸价格 - if !ok { - priceList = []types.PriceObj{ - {Num: 1, Price: 0}, - {Num: 1, Price: 0}, - {Num: 1, Price: 0}, - } - childrenObjList = append(childrenObjList, types.ChildrenObj{ - Id: productSize.Id, - Name: *productSize.Capacity, - PriceList: priceList, - }) - continue - } - if price.StepNum == nil || price.StepPrice == nil { - continue - } - *price.StepNum = strings.Trim(*price.StepNum, " ") - *price.StepPrice = strings.Trim(*price.StepPrice, " ") - - //阶梯数量切片 - stepNum, err := format.StrSlicToIntSlice(strings.Split(*price.StepNum, ",")) - if err != nil { - return nil, err - } - //阶梯价格切片 - stepPrice, err := format.StrSlicToIntSlice(strings.Split(*price.StepPrice, ",")) - if err != nil { - return nil, err - } - if len(stepNum) == 0 || len(stepPrice) == 0 { - return nil, errors.New(fmt.Sprintf("stepNum count or stepPrice count is empty: product size id :%d ,product price id :%d", productSize.Id, price.Id)) - } - index := 0 - // 最小购买数量小于 最大阶梯数量+5 - for int(*price.MinBuyNum) < (stepNum[len(stepNum)-1]+5) && index < 3 { - priceList = append(priceList, types.PriceObj{ - Num: int(*price.MinBuyNum * *price.EachBoxNum), - Price: step_price.GetStepPrice(int(*price.MinBuyNum), stepNum, stepPrice), - }) - *price.MinBuyNum++ - index++ - } - data := types.ChildrenObj{ - Id: productSize.Id, - Name: *productSize.Capacity, - PriceList: priceList, - } - childrenObjList = append(childrenObjList, data) - } - return -} +// 处理逻辑后 w,r 如:重定向, resp 必须重新处理 +// func (l *GetSizeByProductLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) { +// // httpx.OkJsonCtx(r.Context(), w, resp) +// } diff --git a/server/product/internal/types/types.go b/server/product/internal/types/types.go index 2de27f35..f5d96bd6 100644 --- a/server/product/internal/types/types.go +++ b/server/product/internal/types/types.go @@ -440,10 +440,10 @@ type File struct { } type Meta struct { - TotalCount int64 `json:"totalCount"` - PageCount int64 `json:"pageCount"` - CurrentPage int `json:"currentPage"` - PerPage int `json:"perPage"` + TotalCount int64 `json:"total_count"` + PageCount int64 `json:"page_count"` + CurrentPage int `json:"current_page"` + PerPage int `json:"per_page"` } // Set 设置Response的Code和Message值 diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 7f5f0cfb..94475c07 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -369,7 +369,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage st } //发送运行阶段消息 w.sendRenderDataToUnityStepResponseMessage(info.RenderId) - logx.Info("发送到unity成功,刀版图:", combineImage /*, " 请求unity的数据:", string(postDataBytes)*/) + logx.Info("发送到unity成功,刀版图:", combineImage , " 请求unity的数据:", string(postDataBytes)) return nil } diff --git a/service/repositories/order.go b/service/repositories/order.go index 57364a00..7fe9544e 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -15,7 +15,7 @@ import ( "time" "github.com/aws/aws-sdk-go/aws/session" - "github.com/stripe/stripe-go/v74" + "github.com/stripe/stripe-go/v75" "github.com/zeromicro/go-zero/core/logc" "github.com/zeromicro/go-zero/core/logx" "gorm.io/gorm" @@ -80,7 +80,7 @@ type ( PaymentSuccessfulReq struct { EventId string PaymentMethod int64 - PaymentIntent *stripe.PaymentIntent + Charge *stripe.Charge } PaymentSuccessfulRes struct{} /* 支付成功 */ @@ -174,43 +174,43 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess var payAmount int64 var payTitle string var payTime time.Time - if in.PaymentIntent != nil { - paymentIntent := in.PaymentIntent - orderSn, ok = paymentIntent.Metadata["order_sn"] + if in.Charge != nil { + charge := in.Charge + orderSn, ok = charge.Metadata["order_sn"] if !ok || orderSn == "" { err = errors.New("order_sn is empty") logc.Errorf(ctx, "PaymentSuccessful failed param, eventId:%s,err:%v", in.EventId, err) return &PaymentSuccessfulRes{}, err } - payStage, ok = paymentIntent.Metadata["pay_stage"] + payStage, ok = charge.Metadata["pay_stage"] if !ok || payStage == "" { err = errors.New("pay_stage is empty") logc.Errorf(ctx, "PaymentSuccessful failed param, eventId:%s,err:%v", in.EventId, err) return &PaymentSuccessfulRes{}, err } - country, ok = paymentIntent.Metadata["country"] + country, ok = charge.Metadata["country"] if !ok || country == "" { err = errors.New("country is empty") logc.Errorf(ctx, "PaymentSuccessful failed param, eventId:%s,err:%v", in.EventId, err) return &PaymentSuccessfulRes{}, err } - if paymentIntent.LatestCharge.PaymentMethodDetails != nil { - if paymentIntent.LatestCharge.PaymentMethodDetails.Card != nil { - if paymentIntent.LatestCharge.PaymentMethodDetails.Card.Last4 != "" { - card = paymentIntent.LatestCharge.PaymentMethodDetails.Card.Last4 + if charge.PaymentMethodDetails != nil { + if charge.PaymentMethodDetails.Card != nil { + if charge.PaymentMethodDetails.Card.Last4 != "" { + card = charge.PaymentMethodDetails.Card.Last4 } - if paymentIntent.LatestCharge.PaymentMethodDetails.Card.Brand != "" { - brand = string(paymentIntent.LatestCharge.PaymentMethodDetails.Card.Brand) + if charge.PaymentMethodDetails.Card.Brand != "" { + brand = string(charge.PaymentMethodDetails.Card.Brand) } } } - if paymentIntent.Currency != "" { - currency = string(paymentIntent.Currency) + if charge.Currency != "" { + currency = string(charge.Currency) } - tradeSn = paymentIntent.ID - payAmount = paymentIntent.Amount - payTitle = paymentIntent.Description - payTime = time.Unix(paymentIntent.Created, 0) + tradeSn = charge.ID + payAmount = charge.Amount + payTitle = charge.Description + payTime = time.Unix(charge.Created, 0) } err = d.MysqlConn.WithContext(ctx).Transaction(func(tx *gorm.DB) error { var orderInfo gmodel.FsOrder diff --git a/utils/pay/stripe.go b/utils/pay/stripe.go index ba709cbb..eb01cc55 100644 --- a/utils/pay/stripe.go +++ b/utils/pay/stripe.go @@ -1,10 +1,10 @@ package pay import ( - "github.com/stripe/stripe-go/v74" - "github.com/stripe/stripe-go/v74/checkout/session" - "github.com/stripe/stripe-go/v74/paymentintent" - "github.com/stripe/stripe-go/v74/refund" + "github.com/stripe/stripe-go/v75" + "github.com/stripe/stripe-go/v75/checkout/session" + "github.com/stripe/stripe-go/v75/paymentintent" + "github.com/stripe/stripe-go/v75/refund" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/utils/step_price/price.go b/utils/step_price/price.go index f8eb2b9a..ec3748cd 100644 --- a/utils/step_price/price.go +++ b/utils/step_price/price.go @@ -1,20 +1,9 @@ package step_price -// 返回美元 -func GetStepPrice(minBuyNum int, stepNum []int, stepPrice []int) float64 { - if minBuyNum > stepNum[len(stepNum)-1] { - return float64(stepPrice[len(stepPrice)-1]) / float64(1000) - } - for k, v := range stepNum { - if minBuyNum <= v { - if k <= (len(stepPrice) - 1) { - return float64(stepPrice[k]) / float64(1000) - } - return float64(stepPrice[len(stepPrice)-1]) / float64(1000) - } - } - return float64(stepPrice[len(stepPrice)-1]) / float64(1000) -} +import ( + "errors" + "fusenapi/model/gmodel" +) // 返回厘 func GetCentStepPrice(minBuyNum int, stepNum []int, stepPrice []int) int64 { @@ -31,3 +20,47 @@ func GetCentStepPrice(minBuyNum int, stepNum []int, stepPrice []int) int64 { } return int64(stepPrice[len(stepPrice)-1]) } + +// 新的阶梯价格(返回美元) +func GetNewStepPrice(purchaseQuantity int64, stepPrice gmodel.StepPriceJsonStruct, fittingPrice int64) (price float64, err error) { + l := len(stepPrice.PriceRange) + if l == 0 { + return 0, errors.New("price range is not set") + } + //遍历查询合适的价格 + for k, v := range stepPrice.PriceRange { + //购买数量>起点 + if purchaseQuantity > v.StartQuantity { + //最后一个 || 小于等于终点 + if k == l-1 || purchaseQuantity <= v.EndQuantity { + return float64(v.Price+fittingPrice) / 1000, nil + } + } + } + //遍历里面没有则返回第一个 + return float64(stepPrice.PriceRange[0].Price+fittingPrice) / 1000, nil +} + +// 新的阶梯价格(返回厘) +func GetNewCentStepPrice(purchaseQuantity int64, stepPrice gmodel.StepPriceJsonStruct, fittingPrice int64) (price int64, err error) { + l := len(stepPrice.PriceRange) + if l == 0 { + return 0, errors.New("price range is not set") + } + //遍历查询合适的价格 + for k, v := range stepPrice.PriceRange { + //购买数量>起点 + if purchaseQuantity > v.StartQuantity { + //最后一个 + if k == l-1 { + return v.Price + fittingPrice, nil + } + //小于等于终点 + if purchaseQuantity <= v.EndQuantity { + return v.Price + fittingPrice, nil + } + } + } + //遍历里面没有则返回第一个 + return stepPrice.PriceRange[0].Price + fittingPrice, nil +}