refactor payment platform canonicalization and order method consistency

internal/logic/admin/payment/createPaymentMethodLogic.go

@@ -36,11 +36,13 @@ func NewCreatePaymentMethodLogic(ctx context.Context, svcCtx *svc.ServiceContext
 }
 
 func (l *CreatePaymentMethodLogic) CreatePaymentMethod(req *types.CreatePaymentMethodRequest) (resp *types.PaymentConfig, err error) {
-	if payment.ParsePlatform(req.Platform) == payment.UNSUPPORTED {
+	platformType := payment.ParsePlatform(req.Platform)
+	if platformType == payment.UNSUPPORTED {
 		l.Errorw("unsupported payment platform", logger.Field("mark", req.Platform))
 		return nil, errors.Wrapf(xerr.NewErrCodeMsg(400, "UNSUPPORTED_PAYMENT_PLATFORM"), "unsupported payment platform: %s", req.Platform)
 	}
-	config := parsePaymentPlatformConfig(l.ctx, payment.ParsePlatform(req.Platform), req.Config)
+	req.Platform = platformType.String()
+	config := parsePaymentPlatformConfig(l.ctx, platformType, req.Config)
 	var paymentMethod = &paymentModel.Payment{
 		Name:        req.Name,
 		Platform:    req.Platform,
@@ -55,7 +57,7 @@ func (l *CreatePaymentMethodLogic) CreatePaymentMethod(req *types.CreatePaymentM
 		Token:       random.KeyNew(8, 1),
 	}
 	err = l.svcCtx.PaymentModel.Transaction(l.ctx, func(tx *gorm.DB) error {
-		if req.Platform == "Stripe" {
+		if platformType == payment.Stripe {
 			var cfg paymentModel.StripeConfig
 			if err = cfg.Unmarshal([]byte(paymentMethod.Config)); err != nil {
 				l.Errorf("[CreatePaymentMethod] unmarshal stripe config error: %s", err.Error())

internal/logic/admin/payment/updatePaymentMethodLogic.go

@@ -29,7 +29,8 @@ func NewUpdatePaymentMethodLogic(ctx context.Context, svcCtx *svc.ServiceContext
 }
 
 func (l *UpdatePaymentMethodLogic) UpdatePaymentMethod(req *types.UpdatePaymentMethodRequest) (resp *types.PaymentConfig, err error) {
-	if payment.ParsePlatform(req.Platform) == payment.UNSUPPORTED {
+	platformType := payment.ParsePlatform(req.Platform)
+	if platformType == payment.UNSUPPORTED {
 		l.Errorw("unsupported payment platform", logger.Field("mark", req.Platform))
 		return nil, errors.Wrapf(xerr.NewErrCodeMsg(400, "UNSUPPORTED_PAYMENT_PLATFORM"), "unsupported payment platform: %s", req.Platform)
 	}
@@ -38,7 +39,13 @@ func (l *UpdatePaymentMethodLogic) UpdatePaymentMethod(req *types.UpdatePaymentM
 		l.Errorw("find payment method error", logger.Field("id", req.Id), logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find payment method error: %s", err.Error())
 	}
-	config := parsePaymentPlatformConfig(l.ctx, payment.ParsePlatform(req.Platform), req.Config)
+	existingPlatformType := payment.ParsePlatform(method.Platform)
+	if existingPlatformType != payment.UNSUPPORTED && existingPlatformType != platformType {
+		l.Errorw("payment platform mismatch", logger.Field("id", req.Id), logger.Field("current", method.Platform), logger.Field("request", req.Platform))
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.InvalidParams, "payment platform mismatch"), "payment platform mismatch: %s -> %s", method.Platform, req.Platform)
+	}
+	req.Platform = platformType.String()
+	config := parsePaymentPlatformConfig(l.ctx, platformType, req.Config)
 	tool.DeepCopy(method, req, tool.CopyWithIgnoreEmpty(false))
 	method.Config = config
 	if err := l.svcCtx.PaymentModel.Update(l.ctx, method); err != nil {

internal/logic/public/order/paymentMethod.go

@@ -0,0 +1,11 @@
+package order
+
+import paymentPlatform "github.com/perfect-panel/server/pkg/payment"
+
+func canonicalOrderMethod(method string) string {
+	platform := paymentPlatform.ParsePlatform(method)
+	if platform == paymentPlatform.UNSUPPORTED {
+		return method
+	}
+	return platform.String()
+}

internal/logic/public/order/purchaseLogic.go

@@ -224,7 +224,7 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		Coupon:         req.Coupon,
 		CouponDiscount: coupon,
 		PaymentId:      payment.Id,
-		Method:         payment.Platform,
+		Method:         canonicalOrderMethod(payment.Platform),
 		FeeAmount:      feeAmount,
 		Status:         1,
 		IsNew:          isNew,

internal/logic/public/order/rechargeLogic.go

@@ -88,7 +88,7 @@ func (l *RechargeLogic) Recharge(req *types.RechargeOrderRequest) (resp *types.R
 		Amount:    totalAmount,
 		FeeAmount: feeAmount,
 		PaymentId: payment.Id,
-		Method:    payment.Platform,
+		Method:    canonicalOrderMethod(payment.Platform),
 		Status:    1,
 		IsNew:     isNew,
 	}

internal/logic/public/order/renewalLogic.go

@@ -175,7 +175,7 @@ func (l *RenewalLogic) Renewal(req *types.RenewalOrderRequest) (resp *types.Rene
 		Coupon:         req.Coupon,
 		CouponDiscount: coupon,
 		PaymentId:      payment.Id,
-		Method:         payment.Platform,
+		Method:         canonicalOrderMethod(payment.Platform),
 		FeeAmount:      feeAmount,
 		Status:         1,
 		SubscribeId:    userSubscribe.SubscribeId,

internal/logic/public/order/resetTrafficLogic.go

@@ -90,7 +90,7 @@ func (l *ResetTrafficLogic) ResetTraffic(req *types.ResetTrafficOrderRequest) (r
 		GiftAmount:     deductionAmount,
 		FeeAmount:      feeAmount,
 		PaymentId:      payment.Id,
-		Method:         payment.Platform,
+		Method:         canonicalOrderMethod(payment.Platform),
 		Status:         1,
 		SubscribeId:    userSubscribe.SubscribeId,
 		SubscribeToken: userSubscribe.Token,

internal/middleware/deviceMiddleware.go

@@ -89,6 +89,8 @@ func NewResponseWriter(c *gin.Context, srvCtx *svc.ServiceContext) (rw *Response
 	rw = &ResponseWriter{
 		c:              c,
 		body:           new(bytes.Buffer),
+		size:           noWritten,
+		status:         defaultStatus,
 		ResponseWriter: c.Writer,
 	}
 	rw.encryptionKey = srvCtx.Config.Device.SecuritySecret