From 151abc145b8e4ab9fa3da5259f69a7560c9100bf Mon Sep 17 00:00:00 2001 From: zhoujunyao Date: Wed, 4 Feb 2026 13:08:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84uuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/orderRecordsDao.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/internal/dao/orderRecordsDao.go b/internal/dao/orderRecordsDao.go index 4d91592..073e040 100644 --- a/internal/dao/orderRecordsDao.go +++ b/internal/dao/orderRecordsDao.go @@ -818,7 +818,17 @@ func DeleteValueAddService(req *bundle.DeleteValueAddServiceRequest) (res *bundl func UpdateReconciliationStatusBySerialNumber(req *bundle.UpdateStatusAndPayTimeBySerialNumber) (res *bundle.CommonResponse, err error) { var existing model.Reconciliation - if err := app.ModuleClients.BundleDB.Where("serial_number = ?", req.SerialNumber).First(&existing).Error; err != nil { + + //req.SerialNumber现在是orderuuid + var order model.BundleOrderRecords + if err := app.ModuleClients.BundleDB.Where("uuid = ?", req.SerialNumber).First(&order).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, errors.New("订单记录不存在") + } + return nil, fmt.Errorf("查询订单失败: %v", err) + } + + if err := app.ModuleClients.BundleDB.Where("bundle_order_on = ?", req.SerialNumber).First(&existing).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, errors.New("对账单记录不存在") } @@ -827,7 +837,7 @@ func UpdateReconciliationStatusBySerialNumber(req *bundle.UpdateStatusAndPayTime updates := model.Reconciliation{ PayTime: req.PayTime, PayStatus: int(req.PaymentStatus), - SerialNumber: req.SerialNumber, + SerialNumber: order.OrderNo, } if req.PaymentStatus == 2 && existing.CurrencyType == 2 && existing.PayAmount > 0 {