修改
This commit is contained in:
parent
24102eccbd
commit
b149446170
@ -505,7 +505,10 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
|
|||||||
for _, sub := range record.BundleOrderValueAdd {
|
for _, sub := range record.BundleOrderValueAdd {
|
||||||
orderAddNo := sub.OrderNo
|
orderAddNo := sub.OrderNo
|
||||||
amount := float32(sub.Amount)
|
amount := float32(sub.Amount)
|
||||||
|
var videoNum int32
|
||||||
|
if sub.ServiceType == 1 {
|
||||||
|
videoNum = sub.Num
|
||||||
|
}
|
||||||
if existing, ok := addMap[orderAddNo]; ok {
|
if existing, ok := addMap[orderAddNo]; ok {
|
||||||
existing.Amount += amount
|
existing.Amount += amount
|
||||||
} else {
|
} else {
|
||||||
@ -520,6 +523,7 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
|
|||||||
Snapshot: sub.Snapshot,
|
Snapshot: sub.Snapshot,
|
||||||
CheckoutSessionId: sub.CheckoutSessionId,
|
CheckoutSessionId: sub.CheckoutSessionId,
|
||||||
CustomerID: sub.CustomerID,
|
CustomerID: sub.CustomerID,
|
||||||
|
VideoNum: videoNum,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -221,6 +221,7 @@ message OrderAddBundleRecordInfo{
|
|||||||
string snapshot = 10;
|
string snapshot = 10;
|
||||||
string CheckoutSessionId = 11;
|
string CheckoutSessionId = 11;
|
||||||
string CustomerID = 12;
|
string CustomerID = 12;
|
||||||
|
int32 videoNum = 13;
|
||||||
}
|
}
|
||||||
message PackagePriceAndTimeResponse{
|
message PackagePriceAndTimeResponse{
|
||||||
float price = 1 [json_name = "price"];
|
float price = 1 [json_name = "price"];
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -7,8 +7,8 @@ import (
|
|||||||
fmt "fmt"
|
fmt "fmt"
|
||||||
math "math"
|
math "math"
|
||||||
proto "github.com/golang/protobuf/proto"
|
proto "github.com/golang/protobuf/proto"
|
||||||
_ "github.com/mwitkow/go-proto-validators"
|
|
||||||
_ "google.golang.org/protobuf/types/descriptorpb"
|
_ "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 "github.com/mwitkow/go-proto-validators"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user