Compare commits

..

No commits in common. "4ad9771a3ab91f6786f1db407588f42babde2c16" and "b91131b7cde2ca2734592b661eec16a81d231ba3" have entirely different histories.

6 changed files with 1742 additions and 1773 deletions

View File

@ -108,10 +108,6 @@ func UpdateOrderRecordByOrderNO(orderRecord *model.BundleOrderRecords) (res *bun
PaymentStatus: int(orderRecord.Status), PaymentStatus: int(orderRecord.Status),
PaymentTime: orderRecord.PayTime, PaymentTime: orderRecord.PayTime,
} }
if orderRecord.CheckoutSessionId != "" {
valueAdd.CheckoutSessionId = orderRecord.CheckoutSessionId
valueAdd.CheckoutSessionUrl = orderRecord.CheckoutSessionUrl
}
err = app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}). err = app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}).
Where("order_no = ?", orderRecord.OrderNo). Where("order_no = ?", orderRecord.OrderNo).
Updates(valueAdd).Error Updates(valueAdd).Error
@ -481,8 +477,6 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
AddPayStatus: int32(sub.PaymentStatus), AddPayStatus: int32(sub.PaymentStatus),
Contract: sub.SignContract, Contract: sub.SignContract,
Snapshot: sub.Snapshot, Snapshot: sub.Snapshot,
CheckoutSessionId: sub.CheckoutSessionId,
CustomerID: sub.CustomerID,
} }
} }
} }
@ -606,7 +600,6 @@ func CreateReconciliation(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,
CreationTime: time.Now().Format("2006-01-02 15:04:05"),
} }
// 创建记录 // 创建记录

View File

@ -16,5 +16,4 @@ type Reconciliation struct {
PayTime string `gorm:"column:pay_time;comment:支付渠道" json:"payTime"` PayTime string `gorm:"column:pay_time;comment:支付渠道" json:"payTime"`
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"`
} }

View File

@ -93,7 +93,7 @@ message ReconciliationInfo{
uint64 ID = 1; uint64 ID = 1;
string bundleOrderOn = 2; string bundleOrderOn = 2;
string bundleAddOrderOn = 3; string bundleAddOrderOn = 3;
string CreationTime = 4; string createdAT = 4;
string userName = 5; string userName = 5;
string userTel = 6; string userTel = 6;
string bundleName = 7; string bundleName = 7;
@ -196,8 +196,6 @@ message OrderAddBundleRecordInfo{
int32 addPayStatus = 8; int32 addPayStatus = 8;
string contract = 9; string contract = 9;
string snapshot = 10; string snapshot = 10;
string CheckoutSessionId = 11;
string CustomerID = 12;
} }
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

View File

@ -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"
) )

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 v3.20.3
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle