new tyc

app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go

@@ -60,7 +60,7 @@ func (l *AlipayCallbackLogic) AlipayCallback(w http.ResponseWriter, r *http.Requ
 	default:
 		return nil
 	}
-	order.PlatformOrderId = lzUtils.StringToNullString(notification.OutTradeNo)
+	order.PlatformOrderId = lzUtils.StringToNullString(notification.TradeNo)
 	if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
 		logx.Errorf("支付宝支付回调，修改订单信息失败: %+v", updateErr)
 		return nil

app/user/cmd/api/internal/logic/pay/paymentlogic.go

@@ -2,7 +2,6 @@ package pay
 
 import (
 	"context"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"tyc-server/app/user/cmd/api/internal/svc"
@@ -10,7 +9,6 @@ import (
 	"tyc-server/app/user/model"
 	"tyc-server/common/ctxdata"
 	"tyc-server/common/xerr"
-	"tyc-server/pkg/lzkit/crypto"
 
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -41,7 +39,8 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 	if !ok {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取平台失败, %+v", getUidErr)
 	}
-	redisKey := fmt.Sprintf("%d:%s", userID, req.Id)
+	outTradeNo := req.Id
+	redisKey := fmt.Sprintf("%d:%s", userID, outTradeNo)
 	cache, cacheErr := l.svcCtx.Redis.GetCtx(l.ctx, redisKey)
 	if cacheErr != nil {
 		return nil, cacheErr
@@ -56,21 +55,7 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 查找产品错误: %+v", err)
 	}
-	secretKey := l.svcCtx.Config.Encrypt.SecretKey
-	key, decodeErr := hex.DecodeString(secretKey)
-	if decodeErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取AES密钥失败: %+v", decodeErr)
-	}
-	params, marshalErr := json.Marshal(data.Params)
-	if marshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 序列化参数失败: %+v", marshalErr)
-	}
-	encryptParams, aesEncryptErr := crypto.AesEncrypt(params, key)
-	if aesEncryptErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 加密参数失败: %+v", aesEncryptErr)
-	}
 	var prepayData interface{}
-	var outTradeNo string
 	var amount float64
 	user, err := l.svcCtx.UserModel.FindOne(l.ctx, userID)
 	if err != nil {
@@ -85,13 +70,10 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 
 	var createOrderErr error
 	if req.PayMethod == "wechat" {
-		outTradeNo = l.svcCtx.WechatPayService.GenerateOutTradeNo()
 		prepayData, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, amount, product.ProductName, outTradeNo)
 	} else if req.PayMethod == "alipay" {
-		outTradeNo = l.svcCtx.AlipayService.GenerateOutTradeNo()
 		prepayData, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, amount, product.ProductName, outTradeNo, brand)
 	} else if req.PayMethod == "appleiap" {
-		outTradeNo = l.svcCtx.ApplePayService.GenerateOutTradeNo()
 		prepayData = l.svcCtx.ApplePayService.GetIappayAppID(product.ProductEn)
 	}
 	if createOrderErr != nil {
@@ -99,17 +81,12 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 	}
 	var orderID int64
 	transErr := l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
-
-		paymentScene := "app"
-		if brand == "tyc" {
-			paymentScene = "tyc"
-		}
 		order := model.Order{
 			OrderNo:         outTradeNo,
 			UserId:          userID,
 			ProductId:       product.Id,
 			PaymentPlatform: req.PayMethod,
-			PaymentScene:    paymentScene,
+			PaymentScene:    "tyc",
 			Amount:          amount,
 			Status:          "pending",
 		}
@@ -122,17 +99,6 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 			return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取保存订单ID失败: %+v", lastInsertIdErr)
 		}
 		orderID = insertedOrderID
-		query := model.Query{
-			OrderId:     orderID,
-			UserId:      userID,
-			ProductId:   product.Id,
-			QueryParams: encryptParams,
-			QueryState:  "pending",
-		}
-		_, insertQueryErr := l.svcCtx.QueryModel.Insert(l.ctx, session, &query)
-		if insertQueryErr != nil {
-			return insertQueryErr
-		}
 		return nil
 	})
 	if transErr != nil {