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

server/pay/Dockerfile

@@ -0,0 +1,6 @@
+FROM alpine
+
+WORKDIR /www/fusenapi/
+COPY ./bin/api-pay-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
+CMD ["/www/fusenapi/api-pay-srv"]

server/pay/etc/pay.yaml

@@ -1,8 +1,6 @@
 Name: pay
 Host: 0.0.0.0
 Port: 9915
-ReplicaId: 45
-Timeout: 15000
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
     AccessSecret: fusen2023

server/pay/internal/handler/orderrefundhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/pay/internal/logic"
+	"fusenapi/server/pay/internal/svc"
+	"fusenapi/server/pay/internal/types"
+)
+
+func OrderRefundHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.OrderRefundReq
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewOrderRefundLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.OrderRefund(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/pay/internal/handler/routes.go

@@ -17,6 +17,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/pay/payment-intent",
 				Handler: OrderPaymentIntentHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/pay/refund",
+				Handler: OrderRefundHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/api/pay/stripe-webhook",

server/pay/internal/handler/stripewebhookhandler.go

@@ -30,6 +30,15 @@ func StripeWebhookHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		// 	return
 		// }
 
+		IPAddress := r.Header.Get("X-Real-Ip")
+		if IPAddress == "" {
+			IPAddress = r.Header.Get("X-Forwarded-For")
+		}
+		if IPAddress == "" {
+			IPAddress = r.RemoteAddr
+		}
+
+		req.RemoteAddr = IPAddress
 		req.Payload = payload
 		req.StripeSignature = r.Header.Get("Stripe-Signature")
 

server/pay/internal/logic/orderrefundlogic.go

@@ -0,0 +1,43 @@
+package logic
+
+import (
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+
+	"context"
+
+	"fusenapi/server/pay/internal/svc"
+	"fusenapi/server/pay/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type OrderRefundLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewOrderRefundLogic(ctx context.Context, svcCtx *svc.ServiceContext) *OrderRefundLogic {
+	return &OrderRefundLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *OrderRefundLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *OrderRefundLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }
+
+func (l *OrderRefundLogic) OrderRefund(req *types.OrderRefundReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
+	// userinfo 传入值时, 一定不为null
+
+	return resp.SetStatus(basic.CodeOK)
+}

server/pay/internal/logic/stripewebhooklogic.go

@@ -64,6 +64,21 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 		return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "Webhook signature verification failed")
 	}
 
+	// 新增支付回调事件日志
+	var payMethod = int64(constants.PAYMETHOD_STRIPE)
+	var nowTime = time.Now().Unix()
+	var eventData = string(event.Data.Raw)
+	var fsPayEvent = &gmodel.FsPayEvent{
+		PayMethod:    &payMethod,
+		EventId:      &event.ID,
+		EventType:    &event.Type,
+		EventData:    &eventData,
+		EventCreated: &event.Created,
+		Ip:           &req.RemoteAddr,
+		CreatedAt:    &nowTime,
+	}
+	l.HandlePayEventCreate(fsPayEvent)
+
 	// Unmarshal the event data into an appropriate struct depending on its Type
 	switch event.Type {
 	case "charge.succeeded":
@@ -91,12 +106,13 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 		var paymentIntent stripe.PaymentIntent
 		err := json.Unmarshal(event.Data.Raw, &paymentIntent)
 		if err != nil {
-			logx.Error(err)
+			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)
+		err = l.HandlePaymentIntentSucceeded(&paymentIntent)
 		if err != nil {
-			return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type Unhandled")
+			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
@@ -105,6 +121,19 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 			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)
+		if err != nil {
+			logx.Errorf("err：%+v，desc：%s", err, "pay notify Unmarshal fail event.Type charge.refunded")
+			return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type charge.refunded")
+		}
+		err = l.HandleChargeRefunded(&chargeRefunded)
+		if err != nil {
+			logx.Errorf("err：%+v，desc：%s", err, "pay notify handle charge.refunded")
+			return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify handle charge.refunded")
+		}
+
 	// ... handle other event types
 	default:
 		logx.Error("Unhandled event")
@@ -114,6 +143,72 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 	return resp.SetStatus(basic.CodeOK)
 }
 
+// 回调事件日志
+func (l *StripeWebhookLogic) HandlePayEventCreate(fsPayEvent *gmodel.FsPayEvent) error {
+	_, err := gmodel.NewFsPayEventModel(l.svcCtx.MysqlConn).CreateOrUpdate(l.ctx, fsPayEvent)
+	return err
+}
+
+// 退款成功
+func (l *StripeWebhookLogic) HandleChargeRefunded(chargeRefunded *stripe.Charge) (err error) {
+	// 退款成功
+	if chargeRefunded.Status == "succeeded" {
+		orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
+		err = orderModel.Trans(l.ctx, func(ctx context.Context, connGorm *gorm.DB) (err error) {
+			// 查询支付记录
+			payModelT := gmodel.NewFsPayModel(connGorm)
+			payModelTRSB := payModelT.RowSelectBuilder(nil)
+			payModelTRSB1 := payModelTRSB.Where("trade_no = ?", chargeRefunded.PaymentIntent.ID).Where("pay_status = ?", constants.PAYSTATUS_SUCCESS).Where("is_refund = ?", 0)
+			payInfo, err := payModelT.FindOneByQuery(l.ctx, payModelTRSB1, nil)
+			if err != nil {
+				return err
+			}
+			// 更新支付记录
+			*payInfo.IsRefund = 1
+			_, err = payModelT.CreateOrUpdate(ctx, payInfo)
+			if err != nil {
+				return err
+			}
+			// 获取是否还有未退款的数据
+			payModelTRSB2 := payModelTRSB.Where("order_number = ?", payInfo.OrderNumber).Where("pay_status = ?", constants.PAYSTATUS_SUCCESS).Where("is_refund = ?", 0)
+			count, err := payModelT.FindCount(l.ctx, payModelTRSB2, nil)
+			if count == 0 {
+				// 退款完成更新订单状态
+				orderModelT := gmodel.NewFsOrderModel(connGorm)
+				orderModelTRSB := orderModelT.RowSelectBuilder(nil).Where("sn =?", payInfo.OrderNumber)
+				orderInfoRel, err := orderModelT.FindOneByQuery(ctx, orderModelTRSB, nil)
+				if err != nil {
+					return err
+				}
+				var isRefunded int64 = 1
+				var isRefunding int64 = 1
+				var orderStatus int64 = int64(constants.STATUS_NEW_REFUNDED)
+				var orderInfo = &gmodel.FsOrder{}
+				orderInfo.Id = orderInfoRel.Id
+				orderInfo.IsRefunded = &isRefunded
+				orderInfo.IsRefunding = &isRefunding
+				orderInfo.Status = &orderStatus
+				orderModelT.Update(ctx, orderInfo)
+
+				// 记录退款原因
+				refundReasonModelT := gmodel.NewFsRefundReasonModel(connGorm)
+				refundReasonModelTRSB := refundReasonModelT.RowSelectBuilder(nil).Where("order_id =?", orderInfoRel.Id)
+				refundReasonInfo, err := refundReasonModelT.FindOneByQuery(ctx, refundReasonModelTRSB, nil)
+				if err != nil {
+					return err
+				}
+				*refundReasonInfo.IsRefund = 1
+				_, err = refundReasonModelT.CreateOrUpdate(ctx, refundReasonInfo)
+				if err != nil {
+					return err
+				}
+			}
+			return err
+		})
+	}
+	return err
+}
+
 // session完成
 // func (l *StripeWebhookLogic) handlePaymentSessionCompleted(sessionId string, tradeNo string) (err error) {
 // 	// 查询支付记录
@@ -136,8 +231,8 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 // 	return err
 // }
 
-// 成功的付款
-func (l *StripeWebhookLogic) handlePaymentIntentSucceeded(paymentIntent *stripe.PaymentIntent) error {
+// 付款成功
+func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.PaymentIntent) error {
 	orderSn, ok := paymentIntent.Metadata["order_sn"]
 	if !ok || orderSn == "" {
 		return errors.New("order_sn not found")
@@ -146,14 +241,12 @@ func (l *StripeWebhookLogic) handlePaymentIntentSucceeded(paymentIntent *stripe.
 	// 查询支付记录
 	payModel := gmodel.NewFsPayModel(l.svcCtx.MysqlConn)
 	rsbPay := payModel.RowSelectBuilder(nil)
-	rsbPay = rsbPay.Where("order_number = ?", orderSn)
+	rsbPay = rsbPay.Where("order_number = ?", orderSn).Where("pay_status = ?", constants.PAYSTATUS_UNSUCCESS)
 	payInfo, err := payModel.FindOneByQuery(l.ctx, rsbPay, nil)
 	if err != nil {
 		return err
 	}
-	if *payInfo.PayStatus == 1 {
-		return errors.New("pay status 1")
-	}
+
 	//订单信息
 	orderDetailTemplateModel := gmodel.NewFsOrderDetailTemplateModel(l.svcCtx.MysqlConn)
 	orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
@@ -209,6 +302,7 @@ func (l *StripeWebhookLogic) handlePaymentIntentSucceeded(paymentIntent *stripe.
 			*payInfo.PayTime = nowTime
 			*payInfo.CardNo = card
 			*payInfo.Brand = brand
+			*payInfo.TradeNo = paymentIntent.ID
 			_, err = payModelT.CreateOrUpdate(ctx, payInfo)
 			if err != nil {
 				return err
@@ -244,12 +338,12 @@ func (l *StripeWebhookLogic) handlePaymentIntentSucceeded(paymentIntent *stripe.
 
 			// 支付记录是尾款
 			if *payInfo.PayStage == int64(constants.PAYSTAGE_REMAINING) {
-				if *orderInfo.Status < int64(constants.STATUS_NEW_PAY_COMPLETED) {
+				if *fsOrderRelInfo.Status < int64(constants.STATUS_NEW_PAY_COMPLETED) {
 					orderStatus = int64(constants.STATUS_NEW_PAY_COMPLETED)
 				}
 				orderIsPayCompleted = 1
 				orderInfo.IsPayCompleted = &orderIsPayCompleted
-				orderPayedAmount = *orderInfo.PayedAmount + paymentIntent.Amount
+				orderPayedAmount = *fsOrderRelInfo.PayedAmount + paymentIntent.Amount
 			}
 
 			// 更新订单信息

server/pay/internal/types/types.go

@@ -5,6 +5,12 @@ import (
 	"fusenapi/utils/basic"
 )
 
+type OrderRefundReq struct {
+}
+
+type OrderRefundRes struct {
+}
+
 type OrderPaymentIntentReq struct {
 	Sn             string `form:"sn"`              //订单编号
 	DeliveryMethod int64  `form:"delivery_method"` //发货方式
@@ -20,6 +26,7 @@ type OrderPaymentIntentRes struct {
 type StripeWebhookReq struct {
 	Payload         []byte `json:"base_byte_slice,optional"`
 	StripeSignature string `json:"Stripe-Signature"`
+	RemoteAddr      string `json:"remote_addr"`
 }
 
 type Request struct {