修复商福通客户端加解密逻辑，交易表新增收单机构字段用来保存实际支付方式，取消交易接口实现

2025-06-05 12:59:07 +08:00
parent 392e404d68
commit 692106ae5c
9 changed files with 452 additions and 170 deletions
--- a/web/services/trade.go
+++ b/web/services/trade.go
@@ -103,6 +103,7 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T

 	// 创建支付订单
 	var payUrl string
+	var acquirer trade2.Acquirer
 	switch method {

 	// 调用支付宝支付接口
@@ -122,6 +123,7 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
 			return nil, err
 		}
 		payUrl = resp.String()
+		acquirer = trade2.AcquirerAlipay

 	// 调用微信支付接口
 	case trade2.MethodWeChat:
@@ -140,6 +142,34 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
 			return nil, err
 		}
 		payUrl = *resp.CodeUrl
+		acquirer = trade2.AcquirerWeChat
+
+	// 调用商福通接口
+	case trade2.MethodSft:
+		resp, err := g.SFTPay.PaymentScanPay(&g.PaymentScanPayReq{
+			MchOrderNo:   tradeNo,
+			Subject:      subject,
+			Body:         subject,
+			Amount:       amountReal.Mul(decimal.NewFromInt(100)).Round(0).IntPart(),
+			Currency:     "cny",
+			ClientIp:     "",
+			OrderTimeout: u.P(expire.Format("2006-01-02 15:04:05")),
+		})
+		if err != nil {
+			return nil, err
+		}
+		payUrl = u.Z(u.Z(resp.PayInfo).QrCodeUrl)
+		if payUrl == "" {
+			return nil, errors.New("支付接口未返回正确的二维码地址")
+		}
+		switch resp.PayType {
+		case g.SftAlipay:
+			acquirer = trade2.AcquirerAlipay
+		case g.SftWeChat:
+			acquirer = trade2.AcquirerWeChat
+		case g.SftUnionPay:
+			acquirer = trade2.AcquirerUnionPay
+		}

 	// 不支持的支付方式
 	default:
@@ -156,13 +186,14 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
 	}

 	var trade = m.Trade{
-		UserID:  uid,
-		InnerNo: tradeNo,
-		Subject: subject,
-		Method:  int32(method),
-		Type:    int32(tType),
-		Amount:  amount,
-		PayURL:  &payUrl,
+		UserID:   uid,
+		InnerNo:  tradeNo,
+		Subject:  subject,
+		Method:   int32(method),
+		Type:     int32(tType),
+		Amount:   amount,
+		PayURL:   &payUrl,
+		Acquirer: int32(acquirer),
 	}
 	err = q.Trade.Create(&trade)
 	if err != nil {
@@ -198,105 +229,176 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
 		Trade:   &trade,
 	}, nil
 }
-func (s *tradeService) SendCreateTradeByRedirect() {
-	panic("todo")
-}
+func (s *tradeService) SendCreateTradeByRedirect(q *q.Query, uid int32, now time.Time, data *TradeCreateData) (*TradeCreateResult, error) {
+	var subject = data.Subject
+	var expire = data.ExpireAt
+	var tType = data.Type
+	var method = data.Method
+	var amount = data.Amount

-func (s *tradeService) OnTradeCreated(q *q.Query, data *OnTradeCreateData) (*m.Trade, error) {
-	var transId = data.TransId
-	var tradeNo = data.TradeNo
-	var payment = data.Payment
-	var paidAt = data.Time
+	// 实际支付金额，只在创建真实订单时使用
+	var amountReal = data.Amount
+	if env.RunMode == "debug" {
+		amountReal = decimal.NewFromFloat(0.01)
+	}

-	// 获取交易信息
-	trade, err := q.Trade.
-		Where(q.Trade.InnerNo.Eq(tradeNo)).
-		First()
+	// 附加优惠券
+	if data.CouponCode != "" {
+		coupon, err := q.Coupon.
+			Where(
+				q.Coupon.Code.Eq(data.CouponCode),
+				q.Coupon.Status.Eq(int32(coupon2.StatusUnused)),
+			).
+			Take()
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return nil, errors.New("优惠券不存在或已失效")
+			}
+			return nil, err
+		}
+
+		var expireAt = time.Time(u.Z(coupon.ExpireAt))
+		if !expireAt.IsZero() && expireAt.Before(now) {
+			_, err = q.Coupon.
+				Where(q.Coupon.ID.Eq(coupon.ID)).
+				Update(q.Coupon.Status, coupon2.StatusExpired)
+			if err != nil {
+				return nil, err
+			}
+			return nil, errors.New("优惠券已过期")
+		}
+
+		if amount.Cmp(coupon.MinAmount) < 0 {
+			return nil, errors.New("订单金额未达到使用优惠券的条件")
+		}
+
+		if coupon.UserID != nil {
+			switch *coupon.UserID {
+			// 指定用户的优惠券
+			case uid:
+				amount = amount.Sub(coupon.Amount)
+				if expireAt.IsZero() {
+					_, err = q.Coupon.
+						Where(q.Coupon.ID.Eq(coupon.ID)).
+						Update(q.Coupon.Status, int32(coupon2.StatusUsed))
+					if err != nil {
+						return nil, err
+					}
+				}
+			// 该优惠券不属于当前用户
+			default:
+				return nil, errors.New("优惠券不属于当前用户")
+			}
+		} else {
+			// 公开优惠券
+			amount = amount.Sub(coupon.Amount)
+		}
+	}
+
+	// 生成订单号
+	tradeNo, err := ID.GenSerial(context.Background())
 	if err != nil {
 		return nil, err
 	}

-	// 检查交易状态
-	switch trade2.Status(trade.Status) {
+	// 创建支付订单
+	var payUrl string
+	var acquirer trade2.Acquirer
+	switch method {

-	// 如果已退款或取消，则返回错误
-	case trade2.StatusCanceled, trade2.StatusRefunded:
-		return nil, errors.New("交易已取消或已退款")
-
-	// 如果是未支付，则更新支付状态
-	case trade2.StatusPending:
-		trade.Status = int32(trade2.StatusSuccess)
-		trade.OuterNo = &transId
-		trade.Payment = payment
-		trade.PaidAt = u.P(orm.LocalDateTime(paidAt))
-		trade.PayURL = u.P("")
-		_, err = q.Trade.Updates(trade)
+	// 调用商福通接口
+	case trade2.MethodSftAlipay, trade2.MethodSftWeChat:
+		var payType g.SftPayType
+		if method == trade2.MethodSftAlipay {
+			payType = g.SftAlipay
+		} else {
+			payType = g.SftWeChat
+		}
+		resp, err := g.SFTPay.PaymentH5Pay(&g.PaymentH5PayReq{
+			MchOrderNo:   tradeNo,
+			Subject:      subject,
+			Body:         subject,
+			Amount:       amountReal.Mul(decimal.NewFromInt(100)).Round(0).IntPart(),
+			PayType:      payType,
+			Currency:     "cny",
+			ClientIp:     "",
+			OrderTimeout: u.P(expire.Format("2006-01-02 15:04:05")),
+		})
 		if err != nil {
 			return nil, err
 		}
-	case trade2.StatusSuccess:
+		payUrl = u.Z(u.Z(resp.PayInfo).PayUrl)
+		if payUrl == "" {
+			return nil, errors.New("支付接口未返回正确的二维码地址")
+		}
+		switch resp.PayType {
+		case g.SftAlipay:
+			acquirer = trade2.AcquirerAlipay
+		case g.SftWeChat:
+			acquirer = trade2.AcquirerWeChat
+		case g.SftUnionPay:
+			acquirer = trade2.AcquirerUnionPay
+		}
+
+	// 不支持的支付方式
+	default:
+		return nil, ErrTransactionNotSupported
 	}

-	return trade, nil
-}
-
-func (s *tradeService) SendCancelTrade(tradeNo string, method trade2.Method) error {
-
-	switch method {
-
-	case trade2.MethodAlipay:
-		resp, err := g.Alipay.TradeCancel(context.Background(), alipay.TradeCancel{
-			OutTradeNo: tradeNo,
-		})
-		if err != nil {
-			return err
-		}
-		if resp.Code != alipay.CodeSuccess {
-			slog.Warn("支付宝交易取消失败", "code", resp.Code, "sub_code", resp.SubCode, "msg", resp.Msg)
-			return errors.New("交易取消失败")
-		}
-
-	case trade2.MethodWeChat:
-		resp, err := g.WechatPay.Native.CloseOrder(context.Background(), native.CloseOrderRequest{
-			Mchid:      &env.WechatPayMchId,
-			OutTradeNo: &tradeNo,
-		})
-		if err != nil {
-			return err
-		}
-		if resp.Response.StatusCode != http.StatusNoContent {
-			body, _ := io.ReadAll(resp.Response.Body)
-			slog.Warn("微信交易取消失败", "code", resp.Response.StatusCode, "body", string(body))
-			return errors.New("交易取消失败")
-		}
+	// 保存交易订单
+	var billType bill2.Type
+	switch tType {
+	case trade2.TypeRecharge:
+		billType = bill2.TypeRecharge
+	case trade2.TypePurchase:
+		billType = bill2.TypeConsume
 	}

-	return nil
-}
-func (s *tradeService) OnTradeCanceled(q *q.Query, tradeNo string, now time.Time) error {
-	_, err := q.Trade.
-		Where(q.Trade.InnerNo.Eq(tradeNo)).
-		Select(q.Trade.Status, q.Trade.CancelAt, q.Trade.PayURL).
-		Updates(m.Trade{
-			Status:   int32(trade2.StatusCanceled),
-			CancelAt: u.P(orm.LocalDateTime(now)),
-			PayURL:   u.P(""),
-		})
+	var trade = m.Trade{
+		UserID:   uid,
+		InnerNo:  tradeNo,
+		Subject:  subject,
+		Method:   int32(method),
+		Type:     int32(tType),
+		Amount:   amount,
+		PayURL:   &payUrl,
+		Acquirer: int32(acquirer),
+	}
+	err = q.Trade.Create(&trade)
 	if err != nil {
-		return err
+		return nil, err
 	}

-	return nil
-}
+	// 保存用户帐单
+	var bill = m.Bill{
+		BillNo:  ID.GenReadable("bil"),
+		UserID:  uid,
+		TradeID: &trade.ID,
+		Info:    &subject,
+		Type:    int32(billType),
+		Amount:  amount,
+	}
+	err = q.Bill.
+		Omit(q.Bill.ResourceID, q.Bill.RefundID).
+		Create(&bill)
+	if err != nil {
+		return nil, err
+	}

-func (s *tradeService) SendRefundTrade(tradeNo string, method trade2.Method) error {
-	panic("todo")
-}
-func (s *tradeService) OnTradeRefunded(q *q.Query, tradeNo string, now time.Time) error {
-	panic("todo")
-}
+	// 提交异步任务更新订单状态
+	_, err = g.Asynq.Enqueue(tasks.NewUpdateTrade(tradeNo, method))
+	if err != nil {
+		return nil, err
+	}

-func (s *tradeService) VerifyTrade(data *TradeVerifyData) (*TradeSuccessResult, error) {
+	return &TradeCreateResult{
+		TradeNo: tradeNo,
+		PayURL:  payUrl,
+		Bill:    &bill,
+		Trade:   &trade,
+	}, nil
+}
+func (s *tradeService) VerifyCreateTrade(data *TradeVerifyData) (*TradeSuccessResult, error) {
 	var tradeNo = data.TradeNo
 	var method = data.Method

@@ -363,6 +465,114 @@ func (s *tradeService) VerifyTrade(data *TradeVerifyData) (*TradeSuccessResult,
 		Time:    paidAt,
 	}, nil
 }
+func (s *tradeService) OnTradeCreated(q *q.Query, data *OnTradeCreateData) (*m.Trade, error) {
+	var transId = data.TransId
+	var tradeNo = data.TradeNo
+	var payment = data.Payment
+	var paidAt = data.Time
+
+	// 获取交易信息
+	trade, err := q.Trade.
+		Where(q.Trade.InnerNo.Eq(tradeNo)).
+		First()
+	if err != nil {
+		return nil, err
+	}
+
+	// 检查交易状态
+	switch trade2.Status(trade.Status) {
+
+	// 如果已退款或取消，则返回错误
+	case trade2.StatusCanceled, trade2.StatusRefunded:
+		return nil, errors.New("交易已取消或已退款")
+
+	// 如果是未支付，则更新支付状态
+	case trade2.StatusPending:
+		trade.Status = int32(trade2.StatusSuccess)
+		trade.OuterNo = &transId
+		trade.Payment = payment
+		trade.PaidAt = u.P(orm.LocalDateTime(paidAt))
+		trade.PayURL = u.P("")
+		_, err = q.Trade.Updates(trade)
+		if err != nil {
+			return nil, err
+		}
+	case trade2.StatusSuccess:
+	}
+
+	return trade, nil
+}
+
+func (s *tradeService) CancelTrade(tradeNo string, method trade2.Method) error {
+
+	switch method {
+
+	case trade2.MethodAlipay:
+		resp, err := g.Alipay.TradeCancel(context.Background(), alipay.TradeCancel{
+			OutTradeNo: tradeNo,
+		})
+		if err != nil {
+			return err
+		}
+		if resp.Code != alipay.CodeSuccess {
+			slog.Warn("支付宝交易取消失败", "code", resp.Code, "sub_code", resp.SubCode, "msg", resp.Msg)
+			return errors.New("交易取消失败")
+		}
+
+	case trade2.MethodWeChat:
+		resp, err := g.WechatPay.Native.CloseOrder(context.Background(), native.CloseOrderRequest{
+			Mchid:      &env.WechatPayMchId,
+			OutTradeNo: &tradeNo,
+		})
+		if err != nil {
+			return err
+		}
+		if resp.Response.StatusCode != http.StatusNoContent {
+			body, _ := io.ReadAll(resp.Response.Body)
+			slog.Warn("微信交易取消失败", "code", resp.Response.StatusCode, "body", string(body))
+			return errors.New("交易取消失败")
+		}
+
+	case trade2.MethodSft:
+		resp, err := g.SFTPay.OrderClose(&g.OrderCloseReq{
+			MchOrderNo: &tradeNo,
+		})
+		if err != nil {
+			return err
+		}
+		if resp.State != "TRADE_CLOSE" {
+			slog.Warn("商福通交易取消失败", "state", resp.State)
+			return errors.New("交易取消失败")
+		}
+
+	default:
+		return ErrTransactionNotSupported
+	}
+
+	return nil
+}
+func (s *tradeService) OnTradeCanceled(q *q.Query, tradeNo string, now time.Time) error {
+	_, err := q.Trade.
+		Where(q.Trade.InnerNo.Eq(tradeNo)).
+		Select(q.Trade.Status, q.Trade.CancelAt, q.Trade.PayURL).
+		Updates(m.Trade{
+			Status:   int32(trade2.StatusCanceled),
+			CancelAt: u.P(orm.LocalDateTime(now)),
+			PayURL:   u.P(""),
+		})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *tradeService) SendRefundTrade(tradeNo string, method trade2.Method) error {
+	panic("todo")
+}
+func (s *tradeService) OnTradeRefunded(q *q.Query, tradeNo string, now time.Time) error {
+	panic("todo")
+}

 type TradeCreateData struct {
 	Subject    string
@@ -396,12 +606,11 @@ type OnTradeCreateData struct {
 	TradeSuccessResult
 }

-type TradeResult int
+type TradePlatform int

 const (
-	TradeSuccess TradeResult = iota + 1
-	TradeCanceled
-	TradeClosed
+	TradePlatformDesktop TradePlatform = iota + 1 // 桌面端
+	TradePlatformMobile                           // 移动端
 )

 type TradeErr string