Merge branch 'develop' into feature/auth

server/home-user-auth/internal/logic/userordercancellogic.go

@@ -76,16 +76,17 @@ func (l *UserOrderCancelLogic) UserOrderCancel(req *types.UserOrderCancelReq, us
 	var nowTime = time.Now().Unix()
 	var payList []handlers.PayInfo
 	// 事务处理
-	err = orderModel.Trans(l.ctx, func(ctx context.Context, connGorm *gorm.DB) (err error) {
+	ctx := l.ctx
+	err = l.svcCtx.MysqlConn.Transaction(func(tx *gorm.DB) error {
 		// 修改订单信息
-		orderModelTS := gmodel.NewFsOrderModel(connGorm)
+		orderModelTS := gmodel.NewFsOrderModel(tx)
 		err = orderModelTS.Update(ctx, orderInfo)
 		if err != nil {
 			return err
 		}
 		// 新增退款记录
 		var isRefund int64 = 0
-		refundReasonModelTS := gmodel.NewFsRefundReasonModel(connGorm)
+		refundReasonModelTS := gmodel.NewFsRefundReasonModel(tx)
 		refundReasonModelTS.CreateOrUpdate(ctx, &gmodel.FsRefundReason{
 			IsRefund:       &isRefund,
 			RefundReasonId: &req.RefundReasonId,
@@ -95,7 +96,7 @@ func (l *UserOrderCancelLogic) UserOrderCancel(req *types.UserOrderCancelReq, us
 		})
 		// 退款申请
 		// 退款申请--查询支付信息
-		fsPayModelTS := gmodel.NewFsPayModel(connGorm)
+		fsPayModelTS := gmodel.NewFsPayModel(tx)
 		rbFsPay := fsPayModelTS.RowSelectBuilder(nil).Where("order_number = ?", orderInfo.Sn).Where("pay_status =?", constants.PAYSTATUS_SUCCESS).Where("is_refund =?", 0)
 		payInfoList, err := fsPayModelTS.FindAll(ctx, rbFsPay, nil, "")
 		if err != nil {