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

Updata：解决冲突

Browse Source
This commit is contained in:
jiaji.H 2026-02-04 13:22:16 +08:00
commit dc55fa5dfe
6 changed files with 690 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/dao/invoiceDao.go
View File

@ -192,6 +192,7 @@ func GetOrderInfoByOrderNo(req *bundle.GetOrderInfoByOrderNoReq) (orderRecord *m
Select(` Select(`
bundle_order_records.customer_name AS user_name, bundle_order_records.customer_name AS user_name,
user.id AS user_id, user.id AS user_id,
bundle_order_records.order_no AS order_no,
bundle_order_records.customer_num AS user_num, bundle_order_records.customer_num AS user_num,
bundle_order_records.amount_type AS amount_type, bundle_order_records.amount_type AS amount_type,
bundle_order_records.total_amount AS total_amount, bundle_order_records.total_amount AS total_amount,
@ -201,7 +202,7 @@ func GetOrderInfoByOrderNo(req *bundle.GetOrderInfoByOrderNoReq) (orderRecord *m
`). `).
Joins("left join `micro-account`.`user` as user on user.id = bundle_order_records.customer_id and user.deleted_at = 0"). Joins("left join `micro-account`.`user` as user on user.id = bundle_order_records.customer_id and user.deleted_at = 0").
Joins("left join `micro-account`.`real_name` as rn on rn.id = user.real_name_id and rn.deleted_at = 0"). Joins("left join `micro-account`.`real_name` as rn on rn.id = user.real_name_id and rn.deleted_at = 0").
Where("order_no = ?", req.OrderNo). Where("uuid = ?", req.Uuid).
Where("bundle_order_records.deleted_at is null"). Where("bundle_order_records.deleted_at is null").
Order("bundle_order_records.created_at DESC"). Order("bundle_order_records.created_at DESC").
First(&orderRecord).Error First(&orderRecord).Error

1
internal/logic/invoiceLogic.go
View File

@ -78,6 +78,7 @@ func GetOrderInfoByOrderNo(req *bundle.GetOrderInfoByOrderNoReq) (*bundle.GetOrd
UserName: orderRecord.UserName, UserName: orderRecord.UserName,
UserId: strconv.FormatInt(orderRecord.UserId, 10), UserId: strconv.FormatInt(orderRecord.UserId, 10),
UserNum: orderRecord.UserNum, UserNum: orderRecord.UserNum,
OrderNo: orderRecord.OrderNo,
TotalAmount: strconv.FormatFloat(float64(orderRecord.TotalAmount), 'f', -1, 64), TotalAmount: strconv.FormatFloat(float64(orderRecord.TotalAmount), 'f', -1, 64),
BundleName: orderRecord.BundleName, BundleName: orderRecord.BundleName,
AmountType: orderRecord.AmountType, AmountType: orderRecord.AmountType,

3
pb/bundle.proto
View File

@ -2237,7 +2237,7 @@ message GetInvoiceExpressInfoResp{
} }
message GetOrderInfoByOrderNoReq{ message GetOrderInfoByOrderNoReq{
string orderNo = 1; string uuid = 1;
} }
message GetOrderInfoByOrderNoResp{ message GetOrderInfoByOrderNoResp{
@ -2249,6 +2249,7 @@ message GetOrderInfoByOrderNoResp{
int64 AmountType = 6; int64 AmountType = 6;
string address = 7; string address = 7;
string phone = 8; string phone = 8;
string orderNo = 9;
} }
message WorkCastInfo{ message WorkCastInfo{

1353
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

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

@ -5,11 +5,11 @@ package bundle
import ( import (
fmt "fmt" fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
_ "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 "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb"
math "math"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

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 v5.26.1 // - protoc v5.26.0
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle