Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/info/internal/handler/addressaddhandler.go

@@ -14,7 +14,7 @@ import (
 func AddressAddHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		var req types.AddressNameRequest
+		var req types.AddressRequest
 		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return

server/info/internal/logic/addressaddlogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 
@@ -30,11 +31,60 @@ func NewAddressAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Addres
 // func (l *AddressAddLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
 // }
 
-func (l *AddressAddLogic) AddressAdd(req *types.AddressNameRequest, userinfo *auth.UserInfo) (resp *basic.Response) {
+func (l *AddressAddLogic) AddressAdd(req *types.AddressRequest, userinfo *auth.UserInfo) (resp *basic.Response) {
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
-	return resp.SetStatus(basic.CodeOK)
+	if !userinfo.IsUser() {
+		return resp.SetStatus(basic.CodeUnAuth)
+	}
+
+	// 确认这个IsDefault的值范围
+	if !auth.CheckValueRange(req.IsDefault, 0, 1) {
+		return resp.SetStatus(basic.CodeSafeValueRangeErr) // IsDefault值超出范围, 返回安全值范围错误
+	}
+
+	m := l.svcCtx.AllModels.FsAddress // 创建地址模型
+
+	// 如果ID为0, 表示新增地址
+
+	var (
+		country   string = "USA" // 国家默认为美国
+		isDefautl int64  = 1     // 默认地址为1
+		status    int64  = 1     // 默认地址状态为1(正常)
+	)
+
+	createOne := &gmodel.FsAddress{ // 构建FsAddress结构体
+		AddressName: &req.AddressName,
+		FirstName:   &req.FirstName,
+		LastName:    &req.LastName,
+		Mobile:      &req.Mobile,
+		Street:      &req.Street,
+		Suite:       &req.Suite,
+		City:        &req.City,
+		State:       &req.State,
+		Country:     &country,
+		Status:      &status,
+		UserId:      &userinfo.UserId,
+		ZipCode:     &req.ZipCode,
+		IsDefault:   &isDefautl,
+	}
+	_, err := m.CreateOne(l.ctx, createOne) // 新增地址
+	if err != nil {
+		logx.Error(err)                              // 日志记录错误
+		return resp.SetStatus(basic.CodeDbCreateErr) // 返回数据库创建错误
+	}
+
+	addresses, err := m.GetUserAllAddress(l.ctx, userinfo.UserId)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatus(basic.CodeDbSqlErr) // 返回数据库创建错误
+	}
+
+	return resp.SetStatus(basic.CodeOK, map[string]any{
+		"address_list": addresses,
+	}) // 返回成功并返回地址ID
+
 }
 
 // 处理逻辑后 w,r 如:重定向, resp 必须重新处理

server/info/internal/logic/addressdefaultlogic.go

@@ -34,6 +34,10 @@ func (l *AddressDefaultLogic) AddressDefault(req *types.AddressIdRequest, userin
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
+	if !userinfo.IsUser() {
+		return resp.SetStatus(basic.CodeUnAuth)
+	}
+
 	return resp.SetStatus(basic.CodeOK)
 }
 

server/info/internal/types/types.go

@@ -10,8 +10,8 @@ type UserInfoRequest struct {
 }
 
 type AddressObjectRequest struct {
-	AddressId int64  `json:"address_id"` // 地址id
-	Address   string `json:"address"`    // 地址
+	AddressId   int64  `json:"address_id"`   // 地址id
+	AddressName string `json:"address_name"` // 地址
 }
 
 type AddressIdRequest struct {
@@ -19,7 +19,20 @@ type AddressIdRequest struct {
 }
 
 type AddressNameRequest struct {
-	Address string `json:"address"` // 地址
+	AddressName string `json:"address_name"` // 地址
+}
+
+type AddressRequest struct {
+	IsDefault   int64  `json:"is_default"`   //是否默认
+	AddressName string `json:"address_name"` //收货人
+	FirstName   string `json:"first_name"`   //first_name
+	LastName    string `json:"last_name"`    //last_name
+	Mobile      string `json:"mobile"`       //手机
+	ZipCode     string `json:"zip_code"`     //邮编
+	Street      string `json:"street"`       //街道
+	Suite       string `json:"suite"`        //房号
+	City        string `json:"city"`         //城市
+	State       string `json:"state"`        //州
 }
 
 type Request struct {

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"
 )
@@ -73,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
@@ -105,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)
@@ -235,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)
@@ -250,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