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

解决冲突

Browse Source
This commit is contained in:
JNG 2025-10-20 15:20:26 +08:00
commit fb085348dc
4 changed files with 2488 additions and 5466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/orderRecordsDao.go
View File

@ -4,8 +4,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/jinzhu/copier"
"gorm.io/gorm"
"micro-bundle/internal/model" "micro-bundle/internal/model"
"micro-bundle/pb/bundle" "micro-bundle/pb/bundle"
"micro-bundle/pkg/app" "micro-bundle/pkg/app"
@ -14,6 +12,9 @@ import (
"micro-bundle/pkg/utils" "micro-bundle/pkg/utils"
"strconv" "strconv"
"time" "time"
"github.com/jinzhu/copier"
"gorm.io/gorm"
) )
func CreateOrderRecord(orderRecord *model.BundleOrderRecords) (res *bundle.CommonResponse, err error) { func CreateOrderRecord(orderRecord *model.BundleOrderRecords) (res *bundle.CommonResponse, err error) {
@ -311,6 +312,7 @@ func OrderRecordDetail(req *bundle.OrderRecordsDetailRequest) (res *bundle.Order
OrderNo: addBundle.OrderNo, OrderNo: addBundle.OrderNo,
Num: addBundle.Num, Num: addBundle.Num,
ValueAddUUID: addBundle.ValueAddUUID, ValueAddUUID: addBundle.ValueAddUUID,
EquityType: addBundle.EquityType,
} }
addInfos = append(addInfos, addInfo) addInfos = append(addInfos, addInfo)
} }

1
pb/bundle.proto
View File

@ -413,6 +413,7 @@ message AddInfo{
string orderNo = 1 [json_name = "orderNo"]; string orderNo = 1 [json_name = "orderNo"];
int32 num = 2 [json_name = "num"]; int32 num = 2 [json_name = "num"];
string valueAddUUID = 3 [json_name = "valueAddUUID"]; string valueAddUUID = 3 [json_name = "valueAddUUID"];
int32 equityType = 4 [json_name = "equityType"];
} }
message OrderAddRecord{ message OrderAddRecord{

7943
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

4
pb/bundle/bundle_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.5
// - protoc v3.21.1 // - protoc v6.32.0
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle