luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加润格审批总价

Browse Source
This commit is contained in:
jhc 2023-04-04 09:59:15 +08:00
parent 5690a6697c
commit 9e8f13853f
6 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,7 +9,7 @@
### protot文件编译指令 ### protot文件编译指令
```shell ```shell
protoc --go_out=. --go-triple_out=. ./xxxx.proto protoc --proto_path=. --proto_path=D:/go_workspace/src --go_out=./api/approval --govalidators_out=./api/approval --go-triple_out=./api/approval ./api/approval/approval.proto
``` ```
## 二、测试启动fontree-client ## 二、测试启动fontree-client

18
api/approval/approval.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.28.1 // protoc-gen-go v1.26.0
// protoc v3.21.12 // protoc v3.10.1
// source: api/approval/approval.proto // source: api/approval/approval.proto
package approval package approval
@ -1965,6 +1965,7 @@ type ApprovalExhibition struct {
ShowDate string `protobuf:"bytes,9,opt,name=ShowDate,json=showDate,proto3" json:"ShowDate,omitempty"` ShowDate string `protobuf:"bytes,9,opt,name=ShowDate,json=showDate,proto3" json:"ShowDate,omitempty"`
Artworks []*Artwork `protobuf:"bytes,10,rep,name=Artworks,json=artworks,proto3" json:"Artworks,omitempty"` Artworks []*Artwork `protobuf:"bytes,10,rep,name=Artworks,json=artworks,proto3" json:"Artworks,omitempty"`
ArtExhibitionDetail *ArtExhibitionDetail `protobuf:"bytes,11,opt,name=ArtExhibitionDetail,json=artExhibitionDetail,proto3" json:"ArtExhibitionDetail,omitempty"` ArtExhibitionDetail *ArtExhibitionDetail `protobuf:"bytes,11,opt,name=ArtExhibitionDetail,json=artExhibitionDetail,proto3" json:"ArtExhibitionDetail,omitempty"`
TotalPrice int64 `protobuf:"varint,12,opt,name=TotalPrice,json=totalPrice,proto3" json:"TotalPrice,omitempty"`
} }
func (x *ApprovalExhibition) Reset() { func (x *ApprovalExhibition) Reset() {
@ -2076,6 +2077,13 @@ func (x *ApprovalExhibition) GetArtExhibitionDetail() *ArtExhibitionDetail {
return nil return nil
} }
func (x *ApprovalExhibition) GetTotalPrice() int64 {
if x != nil {
return x.TotalPrice
}
return 0
}
type Exhibition struct { type Exhibition struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -3977,7 +3985,7 @@ var file_api_approval_approval_proto_rawDesc = []byte{
0x6f, 0x76, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x6b, 0x52, 0x0d, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x6f, 0x76, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x6b, 0x52, 0x0d, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76,
0x61, 0x6c, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73,
0x74, 0x55, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x74, 0x69, 0x74, 0x55, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x74, 0x69,
0x73, 0x74, 0x55, 0x49, 0x44, 0x22, 0xa6, 0x03, 0x0a, 0x12, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x73, 0x74, 0x55, 0x49, 0x44, 0x22, 0xc6, 0x03, 0x0a, 0x12, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76,
0x61, 0x6c, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x61, 0x6c, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02,
0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c,
0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01,
@ -4003,7 +4011,9 @@ var file_api_approval_approval_proto_rawDesc = []byte{
0x74, 0x61, 0x69, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x70, 0x70, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x70, 0x70,
0x72, 0x6f, 0x76, 0x61, 0x6c, 0x2e, 0x41, 0x72, 0x74, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x72, 0x6f, 0x76, 0x61, 0x6c, 0x2e, 0x41, 0x72, 0x74, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74,
0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x13, 0x61, 0x72, 0x74, 0x45, 0x78, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x13, 0x61, 0x72, 0x74, 0x45, 0x78,
0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x22, 0xf8, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x1e,
0x0a, 0x0a, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01,
0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x72, 0x69, 0x63, 0x65, 0x22, 0xf8,
0x01, 0x0a, 0x0a, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x01, 0x0a, 0x0a, 0x45, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a,
0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x49, 0x44, 0x12, 0x1e, 0x0a,
0x0a, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x41, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0a, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x41, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,

1
api/approval/approval.proto
View File

@ -236,6 +236,7 @@ message ApprovalExhibition {
string ShowDate =9 [json_name = "showDate"]; string ShowDate =9 [json_name = "showDate"];
repeated Artwork Artworks = 10[json_name = "artworks"]; repeated Artwork Artworks = 10[json_name = "artworks"];
ArtExhibitionDetail ArtExhibitionDetail = 11[json_name = "artExhibitionDetail"]; ArtExhibitionDetail ArtExhibitionDetail = 11[json_name = "artExhibitionDetail"];
int64 TotalPrice = 12 [json_name = "totalPrice"];
} }
message Exhibition { message Exhibition {

2
api/approval/approval_triple.pb.go
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 v3.21.12 // - protoc v3.10.1
// source: api/approval/approval.proto // source: api/approval/approval.proto
package approval package approval

1
pkg/model/approval_reward.go
View File

@ -19,6 +19,7 @@ type ApprovalReward struct {
PackageNumber string `gorm:"column:package_number" json:"packageNumber"` // 序号 PackageNumber string `gorm:"column:package_number" json:"packageNumber"` // 序号
Address string `gorm:"column:address" json:"Address"` // 地点 Address string `gorm:"column:address" json:"Address"` // 地点
ShowDate string `gorm:"type:varchar(32);default:'';column:show_date" json:"ShowDate"` // 位置 ShowDate string `gorm:"type:varchar(32);default:'';column:show_date" json:"ShowDate"` // 位置
TotalPrice int64 `gorm:"type:int(64);default:0;column:total_price" json:"totalPrice"` // 总价
ArtExhibitionDetail ArtExhibitionDetail `gorm:"type:text;column:art_exhibition_detail;comment:绑定的画展包" json:"artExhibitionDetail"` ArtExhibitionDetail ArtExhibitionDetail `gorm:"type:text;column:art_exhibition_detail;comment:绑定的画展包" json:"artExhibitionDetail"`
Artworks Artworks `gorm:"type:text;column:artworks;comment:画作" json:"artworks"` Artworks Artworks `gorm:"type:text;column:artworks;comment:画作" json:"artworks"`
} }

12
pkg/model/exhibition_reward.go
View File

@ -54,6 +54,7 @@ func (m *ExhibitionReward) SaveApprovalContent(in *approval.CreateRequest, a *Ap
PackageNumber: approvalExhibition.PackageNumber, PackageNumber: approvalExhibition.PackageNumber,
Address: approvalExhibition.Address, Address: approvalExhibition.Address,
ShowDate: approvalExhibition.ShowDate, ShowDate: approvalExhibition.ShowDate,
TotalPrice: approvalExhibition.TotalPrice,
} }
//保存包主体 //保存包主体
@ -184,8 +185,9 @@ func (m *ExhibitionReward) UpdateContent(in *approval.CreateRequest, a *Approval
PackageID: inApprovalExhibitionMap[tempId].PackageID, PackageID: inApprovalExhibitionMap[tempId].PackageID,
//PackageSize: inApprovalExhibitionMap[tempId].PackageSize, //PackageSize: inApprovalExhibitionMap[tempId].PackageSize,
//PackageNumber: inApprovalExhibitionMap[tempId].PackageNumber, //PackageNumber: inApprovalExhibitionMap[tempId].PackageNumber,
Address: inApprovalExhibitionMap[tempId].Address, Address: inApprovalExhibitionMap[tempId].Address,
ShowDate: inApprovalExhibitionMap[tempId].ShowDate, ShowDate: inApprovalExhibitionMap[tempId].ShowDate,
TotalPrice: inApprovalExhibitionMap[tempId].TotalPrice,
} }
approvalWorks = append(approvalWorks, temp) approvalWorks = append(approvalWorks, temp)
@ -214,8 +216,9 @@ func (m *ExhibitionReward) UpdateContent(in *approval.CreateRequest, a *Approval
PackageID: inApprovalExhibitionMap[tempId].PackageID, PackageID: inApprovalExhibitionMap[tempId].PackageID,
// PackageSize: inApprovalExhibitionMap[tempId].PackageSize, // PackageSize: inApprovalExhibitionMap[tempId].PackageSize,
// PackageNumber: inApprovalExhibitionMap[tempId].PackageNumber, // PackageNumber: inApprovalExhibitionMap[tempId].PackageNumber,
Address: inApprovalExhibitionMap[tempId].Address, Address: inApprovalExhibitionMap[tempId].Address,
ShowDate: inApprovalExhibitionMap[tempId].ShowDate, ShowDate: inApprovalExhibitionMap[tempId].ShowDate,
TotalPrice: inApprovalExhibitionMap[tempId].TotalPrice,
} }
DB.Model(&ApprovalReward{}). DB.Model(&ApprovalReward{}).
@ -246,6 +249,7 @@ func (m *ExhibitionReward) BuildResContent(a *Approval, request *approval.Create
PackageNumber: one.PackageNumber, PackageNumber: one.PackageNumber,
Address: one.Address, Address: one.Address,
ShowDate: one.ShowDate, ShowDate: one.ShowDate,
TotalPrice: one.TotalPrice,
} }
//保存包主体 //保存包主体