fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-zjy-fixbug-033' into dev

Browse Source
This commit is contained in:
周俊耀 2026-02-04 13:09:05 +08:00
commit 00460ed290
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/dao/orderRecordsDao.go
View File

@ -842,7 +842,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("对账单记录不存在")
}
@ -851,7 +861,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 {