renzhiyuan
/
transfer_middleware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

实物系统对接优化

This commit is contained in:
renzhiyuan 2024-11-19 15:19:09 +08:00
parent ffe83f9757
commit 0a3cde2f76
4 changed files with 1692 additions and 1453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/rpc/internal/logic/po/physical/physical.go
View File

@ -190,6 +190,7 @@ func (r *PhysicalRequest) OrderList() (*transfer.PhysicalOrderListRes, error) {
func (r *PhysicalRequest) OrderSubmit() (*transfer.PhysicalOrderSubRes, error) { func (r *PhysicalRequest) OrderSubmit() (*transfer.PhysicalOrderSubRes, error) {
var res transfer.PhysicalOrderSubRes var res transfer.PhysicalOrderSubRes
req, err := r.request(vo.PHYSICAL_ORDER_SUBMIT) req, err := r.request(vo.PHYSICAL_ORDER_SUBMIT)
if err != nil { if err != nil {
return nil, err return nil, err
} }

54
cmd/rpc/pb/transfer.proto
View File

@ -209,15 +209,24 @@ message OrderOpSubmitGoodsInfo {
message PhysicalOrderListRes{ message PhysicalOrderListRes{
string code = 1; string code = 1;
string message = 2; string message = 2;
PhysicalOrderListResData data = 3; OrderListData data = 3;
} }
message OrderListData{
repeated OrderListDataList list = 1;
uint32 total = 2;
message OrderListDataList{
repeated OrderOpGoodsInfo goodsList = 1;
OrderOpBasicInfo orderBasic = 2;
}
}
message OrderInfoData{
repeated OrderOpGoodsInfo goodsList = 1;
OrderOpBasicInfo orderBasic = 2;
}
message PhysicalOrderListResData{ message PhysicalOrderListResData{
repeated PhysicalOrderInfoRes data = 1; repeated List list = 1;
int32 total = 2; uint32 total = 2;
int32 page = 3;
int32 limit = 4;
} }
message PhysicalOrderListReq { message PhysicalOrderListReq {
@ -239,24 +248,31 @@ message PhysicalOrderInfoRes {
PhysicalOrderInfoResData data = 3; PhysicalOrderInfoResData data = 3;
message PhysicalOrderInfoResData { message PhysicalOrderInfoResData {
OrderInfoData orderInfo=1; OrderInfoData orderInfo=1;
message OrderInfoData{
OrderOpBasicInfo orderBasic = 1;
repeated OrderOpGoodsInfo goodsList = 2;
}
} }
} }
message OrderOpBasicInfo { message OrderOpBasicInfo {
string customer_order_num = 1 ; // 客户订单编号 string customer_order_num = 1 ; // 客户订单编号
string customer_name = 3; // 客户名称 int32 customer_id = 2 ; // 客户ID
string consignee = 4; // 收货人 string customer_name = 3 ; // 客户名称
string consignee_mobile = 5; string consignee = 4 ; // 收货人
string consignee_address = 6; // 收货地址 string consignee_mobile = 5 ;
string consignee_province_code = 7; // 省份编码 string consignee_address = 6 ; // 收货地址
string consignee_city_code = 8; // 市编码 string consignee_province_code = 7 ; // 省份编码
string consignee_area_code = 9; // 区编码 string consignee_city_code = 8 ; // 市编码
string consignee_area_code = 9 ; // 区编码
string consignee_county_code = 10; // 县编码 string consignee_county_code = 10; // 县编码
double total_amount = 12 ; // 订单总额，单位元，小数点两位
string in_remark = 14; // 客服备注 string in_remark = 14; // 客服备注
string created_at = 16;
int32 status = 17;
string send_at = 18;
int32 id = 21; // 订单ID
string order_num = 22; // 订单编号
double logistics_fee = 23; // 运费
int32 order_after_type = 29;
} }
message OrderOpGoodsInfo { message OrderOpGoodsInfo {
@ -337,8 +353,8 @@ message List{
message Address{ message Address{
int64 code = 1 [json_name = "code"]; string code = 1 [json_name = "code"];
int64 pcode = 2 [json_name = "pcode"]; string pcode = 2 [json_name = "pcode"];
string name = 3 [json_name = "name"]; string name = 3 [json_name = "name"];
int32 level = 4[json_name = "level"]; int32 level = 4[json_name = "level"];
} }

3086
cmd/rpc/pb/transfer/transfer.pb.go
View File

File diff suppressed because it is too large Load Diff

4
cmd/rpc/transferClient/transfer.go
View File

@ -43,6 +43,9 @@ type (
NewMarketQueryReq = transfer.NewMarketQueryReq NewMarketQueryReq = transfer.NewMarketQueryReq
OrderAfterOpBasic = transfer.OrderAfterOpBasic OrderAfterOpBasic = transfer.OrderAfterOpBasic
OrderAfterOpGoodsInfo = transfer.OrderAfterOpGoodsInfo OrderAfterOpGoodsInfo = transfer.OrderAfterOpGoodsInfo
OrderInfoData = transfer.OrderInfoData
OrderListData = transfer.OrderListData
OrderListData_OrderListDataList = transfer.OrderListData_OrderListDataList
OrderOpBasicInfo = transfer.OrderOpBasicInfo OrderOpBasicInfo = transfer.OrderOpBasicInfo
OrderOpGoodsInfo = transfer.OrderOpGoodsInfo OrderOpGoodsInfo = transfer.OrderOpGoodsInfo
OrderOpLogistics = transfer.OrderOpLogistics OrderOpLogistics = transfer.OrderOpLogistics
@ -81,7 +84,6 @@ type (
PhysicalOrderInfoReq = transfer.PhysicalOrderInfoReq PhysicalOrderInfoReq = transfer.PhysicalOrderInfoReq
PhysicalOrderInfoRes = transfer.PhysicalOrderInfoRes PhysicalOrderInfoRes = transfer.PhysicalOrderInfoRes
PhysicalOrderInfoRes_PhysicalOrderInfoResData = transfer.PhysicalOrderInfoRes_PhysicalOrderInfoResData PhysicalOrderInfoRes_PhysicalOrderInfoResData = transfer.PhysicalOrderInfoRes_PhysicalOrderInfoResData
PhysicalOrderInfoRes_PhysicalOrderInfoResData_OrderInfoData = transfer.PhysicalOrderInfoRes_PhysicalOrderInfoResData_OrderInfoData
PhysicalOrderListReq = transfer.PhysicalOrderListReq PhysicalOrderListReq = transfer.PhysicalOrderListReq
PhysicalOrderListRes = transfer.PhysicalOrderListRes PhysicalOrderListRes = transfer.PhysicalOrderListRes
PhysicalOrderListResData = transfer.PhysicalOrderListResData PhysicalOrderListResData = transfer.PhysicalOrderListResData