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

Merge branch 'jng'

Browse Source
This commit is contained in:
桀尼龟 2025-07-03 16:11:44 +08:00
commit d5e4c9590f
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/dao/orderRecordsDao.go
View File

@ -513,6 +513,7 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
OrderAddNo: orderAddNo,
Amount: amount,
CurrencyType: int32(sub.CurrencyType),
HandlingFee: sub.HandlingFee, //手续费
OrderAddCreateAt: sub.CreatedAt.Format("2006-01-02 15:04:05"),
AddPayStatus: int32(sub.PaymentStatus),
Contract: sub.SignContract,

1
internal/model/bundle_order_records.go
View File

@ -65,6 +65,7 @@ type BundleOrderValueAdd struct {
Snapshot string `gorm:"column:snapshot;comment:快照" json:"snapshot"` //订单快照
CheckoutSessionId string `json:"checkoutSessionId" gorm:"column:checkout_session_id;type:varchar(1024);default:null;comment:checkoutSessionId"`
CheckoutSessionUrl string `json:"checkoutSessionUrl" gorm:"column:checkout_session_url;type:varchar(1024);default:null;comment:checkoutSessionUrl"`
HandlingFee string `gorm:"column:handling_fee;comment:手续费" json:"handlingFee"`
}
// 财务确认状态

2
pb/bundle.proto
View File

@ -206,7 +206,7 @@ message OrderAddBundleRecordInfo{
float amount = 2;
float settlementAmount = 3;
int32 currencyType = 4;
float handlingFee = 5;
string handlingFee = 5;
float exchangeRate = 6;
string orderAddCreateAt = 7;
int32 addPayStatus = 8;

8
pb/bundle/bundle.pb.go
View File

@ -1284,7 +1284,7 @@ type OrderAddBundleRecordInfo struct {
Amount float32 `protobuf:"fixed32,2,opt,name=amount,proto3" json:"amount"`
SettlementAmount float32 `protobuf:"fixed32,3,opt,name=settlementAmount,proto3" json:"settlementAmount"`
CurrencyType int32 `protobuf:"varint,4,opt,name=currencyType,proto3" json:"currencyType"`
HandlingFee float32 `protobuf:"fixed32,5,opt,name=handlingFee,proto3" json:"handlingFee"`
HandlingFee string `protobuf:"bytes,5,opt,name=handlingFee,proto3" json:"handlingFee"`
ExchangeRate float32 `protobuf:"fixed32,6,opt,name=exchangeRate,proto3" json:"exchangeRate"`
OrderAddCreateAt string `protobuf:"bytes,7,opt,name=orderAddCreateAt,proto3" json:"orderAddCreateAt"`
AddPayStatus int32 `protobuf:"varint,8,opt,name=addPayStatus,proto3" json:"addPayStatus"`
@ -1354,11 +1354,11 @@ func (x *OrderAddBundleRecordInfo) GetCurrencyType() int32 {
return 0
}
func (x *OrderAddBundleRecordInfo) GetHandlingFee() float32 {
func (x *OrderAddBundleRecordInfo) GetHandlingFee() string {
if x != nil {
return x.HandlingFee
}
return 0
return ""
}
func (x *OrderAddBundleRecordInfo) GetExchangeRate() float32 {
@ -7712,7 +7712,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x75,
0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x68, 0x61,
0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x46, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52,
0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x46, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
0x0b, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c,
0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01,
0x28, 0x02, 0x52, 0x0c, 0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x61, 0x74, 0x65,

2
pb/bundle/bundle.validator.pb.go
View File

@ -7,8 +7,8 @@ import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
_ "google.golang.org/protobuf/types/descriptorpb"
_ "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb"
github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
)