fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
eson
2023-08-14 14:12:33 +08:00
parent 117330ee16 6844142603
commit 187cb48a41
39 changed files with 581 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/pay/internal/logic/orderpaymentintentlogic.go
View File

@@ -116,7 +116,7 @@ func (l *OrderPaymentIntentLogic) OrderPaymentIntent(req *types.OrderPaymentInte
var fspay *gmodel.FsPay
newFsPayModel := gmodel.NewFsPayModel(connGorm)
if *orderInfo.Status == int64(constants.STATUS_NEW_NOT_PAY) {
fspay, err = newFsPayModel.GetListByOrderNumberStage(ctx, *orderInfo.Sn, 1)
fspay, err = newFsPayModel.RBGetListByOrderNumberStage(ctx, *orderInfo.Sn, 1)
if err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
return err
@@ -124,7 +124,7 @@ func (l *OrderPaymentIntentLogic) OrderPaymentIntent(req *types.OrderPaymentInte
}
payStage = 1
} else {
fspay, err = newFsPayModel.GetListByOrderNumberStage(ctx, *orderInfo.Sn, 2)
fspay, err = newFsPayModel.RBGetListByOrderNumberStage(ctx, *orderInfo.Sn, 2)
if err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
return err
@@ -146,7 +146,7 @@ func (l *OrderPaymentIntentLogic) OrderPaymentIntent(req *types.OrderPaymentInte
}
// 订单信息--修改
err = gmodel.NewFsOrderModel(connGorm).Update(ctx, orderInfo)
err = gmodel.NewFsOrderModel(connGorm).RBUpdate(ctx, orderInfo)
if err != nil {
return err
}
@@ -167,7 +167,7 @@ func (l *OrderPaymentIntentLogic) OrderPaymentIntent(req *types.OrderPaymentInte
fspay.OrderSource = &orderSource
fspay.PayStatus = &payStatus
_, err = newFsPayModel.CreateOrUpdate(ctx, fspay)
_, err = newFsPayModel.RBCreateOrUpdate(ctx, fspay)
if err != nil {
return err
}

23
server/pay/internal/logic/stripewebhooklogic.go
View File

@@ -157,7 +157,7 @@ func (l *StripeWebhookLogic) HandleChargeRefunded(chargeRefunded *stripe.Charge)
err = l.svcCtx.MysqlConn.Transaction(func(connGorm *gorm.DB) error {
// 查询支付记录
payModelT := gmodel.NewFsPayModel(connGorm)
payModelTRSB := payModelT.RowSelectBuilder(nil)
payModelTRSB := payModelT.BuilderTrans(nil)
payModelTRSB1 := payModelTRSB.Where("trade_no = ?", chargeRefunded.PaymentIntent.ID).Where("pay_status = ?", constants.PAYSTATUS_SUCCESS).Where("is_refund = ?", 0)
payInfo, err := payModelT.FindOneByQuery(ctx, payModelTRSB1, nil)
if err != nil {
@@ -165,7 +165,7 @@ func (l *StripeWebhookLogic) HandleChargeRefunded(chargeRefunded *stripe.Charge)
}
// 更新支付记录
*payInfo.IsRefund = 1
_, err = payModelT.CreateOrUpdate(ctx, payInfo)
_, err = payModelT.RBCreateOrUpdate(ctx, payInfo)
if err != nil {
return err
}
@@ -175,7 +175,7 @@ func (l *StripeWebhookLogic) HandleChargeRefunded(chargeRefunded *stripe.Charge)
if count == 0 {
// 退款完成更新订单状态
orderModelT := gmodel.NewFsOrderModel(connGorm)
orderModelTRSB := orderModelT.RowSelectBuilder(nil).Where("sn =?", payInfo.OrderNumber)
orderModelTRSB := orderModelT.BuilderTrans(nil).Where("sn =?", payInfo.OrderNumber)
orderInfoRel, err := orderModelT.FindOneByQuery(ctx, orderModelTRSB, nil)
if err != nil {
return err
@@ -192,13 +192,14 @@ func (l *StripeWebhookLogic) HandleChargeRefunded(chargeRefunded *stripe.Charge)
// 记录退款原因
refundReasonModelT := gmodel.NewFsRefundReasonModel(connGorm)
refundReasonModelTRSB := refundReasonModelT.RowSelectBuilder(nil).Where("order_id =?", orderInfoRel.Id)
refundReasonInfo, err := refundReasonModelT.FindOneByQuery(ctx, refundReasonModelTRSB, nil)
refundReasonModelTRSB := refundReasonModelT.BuilderTrans(nil)
refundReasonModelTRSB1 := refundReasonModelTRSB.Where("order_id =?", orderInfoRel.Id)
refundReasonInfo, err := refundReasonModelT.FindOneByQuery(ctx, refundReasonModelTRSB1, nil)
if err != nil {
return err
}
*refundReasonInfo.IsRefund = 1
_, err = refundReasonModelT.CreateOrUpdate(ctx, refundReasonInfo)
_, err = refundReasonModelT.RBCreateOrUpdate(ctx, refundReasonInfo)
if err != nil {
return err
}
@@ -304,15 +305,16 @@ func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.
*payInfo.CardNo = card
*payInfo.Brand = brand
*payInfo.TradeNo = paymentIntent.ID
_, err = payModelT.CreateOrUpdate(ctx, payInfo)
_, err = payModelT.RBCreateOrUpdate(ctx, payInfo)
if err != nil {
return err
}
// 更新设计数据
productDesignModelT := gmodel.NewFsProductDesignModel(connGorm)
productDesignModelTRSB := productDesignModelT.BuilderTrans(ctx, nil)
var isPay int64 = 1
err = productDesignModelT.UpdateByIds(ctx, designIds, &gmodel.FsProductDesign{IsPay: &isPay})
err = productDesignModelT.RBUpdateByIds(productDesignModelTRSB, designIds, &gmodel.FsProductDesign{IsPay: &isPay})
if err != nil {
return err
}
@@ -331,7 +333,8 @@ func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.
// 删除购物车
cartModelT := gmodel.NewFsCartModel(connGorm)
err = cartModelT.DeleteCartsByIds(ctx, cartIds)
cartModelTRSB := cartModelT.BuilderTrans(ctx, nil)
err = cartModelT.RBDeleteCartsByIds(cartModelTRSB, cartIds)
if err != nil {
return err
}
@@ -353,7 +356,7 @@ func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.
orderInfo.Ptime = &nowTime
orderInfo.PayedAmount = &orderPayedAmount
orderModelT := gmodel.NewFsOrderModel(connGorm)
err = orderModelT.Update(ctx, orderInfo)
err = orderModelT.RBUpdate(ctx, orderInfo)
if err != nil {
return err
}