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

解决冲突

Browse Source
This commit is contained in:
桀尼龟 2025-07-08 16:12:50 +08:00
commit dad01f7f85
4 changed files with 1455 additions and 1441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dao/orderRecordsDao.go
View File

@ -663,6 +663,7 @@ func CreateReconciliation(req *bundle.ReconciliationInfo) (res *bundle.CommonRes
PayStatus: int(req.PayStatus), PayStatus: int(req.PayStatus),
SerialNumber: req.SerialNumber, SerialNumber: req.SerialNumber,
CreationTime: time.Now().Format("2006-01-02 15:04:05"), CreationTime: time.Now().Format("2006-01-02 15:04:05"),
HandlingFee: req.HandlingFee,
} }
// 创建记录 // 创建记录
@ -693,6 +694,7 @@ func UpdateReconciliation(req *bundle.ReconciliationInfo) (res *bundle.CommonRes
PayTime: req.PayTime, PayTime: req.PayTime,
PayStatus: int(req.PayStatus), PayStatus: int(req.PayStatus),
SerialNumber: req.SerialNumber, SerialNumber: req.SerialNumber,
HandlingFee: req.HandlingFee,
} }
if err := app.ModuleClients.BundleDB.Model(&existing).Updates(updates).Error; err != nil { if err := app.ModuleClients.BundleDB.Model(&existing).Updates(updates).Error; err != nil {
return nil, fmt.Errorf("更新对账单失败: %v", err) return nil, fmt.Errorf("更新对账单失败: %v", err)

1
internal/model/reconciliation.go
View File

@ -17,4 +17,5 @@ type Reconciliation struct {
PayStatus int `gorm:"column:pay_status;comment:支付状态" json:"payStatus"` PayStatus int `gorm:"column:pay_status;comment:支付状态" json:"payStatus"`
SerialNumber string `gorm:"column:serial_number;comment:流水号" json:"serialNumber"` SerialNumber string `gorm:"column:serial_number;comment:流水号" json:"serialNumber"`
CreationTime string `gorm:"column:creation_time;comment:创建时间" json:"creationTime"` CreationTime string `gorm:"column:creation_time;comment:创建时间" json:"creationTime"`
HandlingFee string `gorm:"column:handling_fee;comment:手续费" json:"handlingFee"`
} }

1
pb/bundle.proto
View File

@ -120,6 +120,7 @@ message ReconciliationInfo{
int32 payStatus = 12; int32 payStatus = 12;
string serialNumber = 13; string serialNumber = 13;
uint64 userID = 14; uint64 userID = 14;
string handlingFee = 15;
} }
message OrderInfoByOrderNoRequest{ message OrderInfoByOrderNoRequest{
string orderNo = 1; string orderNo = 1;

2892
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff