Compare commits

..

No commits in common. "24102eccbd903d995ace5e9cb16716c777017f57" and "68dd832b329dd8b8ea2a93b9e0a1d8c13cbc597d" have entirely different histories.

6 changed files with 1460 additions and 1474 deletions

View File

@ -663,7 +663,6 @@ 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,
} }
// 创建记录 // 创建记录
@ -694,7 +693,6 @@ 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)

View File

@ -17,5 +17,4 @@ 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"`
} }

View File

@ -120,7 +120,6 @@ 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;

File diff suppressed because it is too large Load Diff

View File

@ -5,11 +5,11 @@ package bundle
import ( import (
fmt "fmt" fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
_ "github.com/mwitkow/go-proto-validators" _ "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb"
github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators" github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb"
math "math"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT. // Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions: // versions:
// - protoc-gen-go-triple v1.0.8 // - protoc-gen-go-triple v1.0.8
// - protoc v4.24.0--rc1 // - protoc v5.26.1
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle