Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
238cb0f7
Commit
238cb0f7
authored
Aug 05, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交订单列表和详情返回分类包邮规则备注
parent
6383400c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+4
-2
MallBaseController.cs
Mall.WebApi/Controllers/MallBase/MallBaseController.cs
+2
-1
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+2
-1
OrderController.cs
Mall.WebApi/Controllers/Product/OrderController.cs
+2
-1
No files found.
Mall.Module.Product/OrderModule.cs
View file @
238cb0f7
...
...
@@ -690,7 +690,8 @@ namespace Mall.Module.Product
x
.
Number
,
x
.
Final_Price
,
x
.
IsComment
,
x
.
IsApplyForAfterSale
x
.
IsApplyForAfterSale
,
x
.
FreeShippingRemarks
}),
model
.
IsApplyForCancel
,
model
.
RejectRemark
,
...
...
@@ -7946,7 +7947,8 @@ namespace Mall.Module.Product
x
.
Number
,
x
.
Original_Price
,
x
.
Final_Price
,
x
.
IsBindExpress
x
.
IsBindExpress
,
x
.
FreeShippingRemarks
})
});
}
...
...
Mall.WebApi/Controllers/MallBase/MallBaseController.cs
View file @
238cb0f7
...
...
@@ -996,7 +996,8 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
FullMoneyPinkage
,
x
.
FullNumPinkage
,
x
.
CategoryList
,
x
.
IsEnable
x
.
IsEnable
,
x
.
Name
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
238cb0f7
...
...
@@ -236,7 +236,8 @@ namespace Mall.WebApi.Controllers.MallBase
y
.
ProductCode
,
y
.
Final_Price
,
y
.
Number
,
y
.
IsComment
y
.
IsComment
,
y
.
FreeShippingRemarks
}),
x
.
OrderStatus
,
OrderStatusName
=
x
.
OrderStatus
.
GetEnumName
(),
...
...
Mall.WebApi/Controllers/Product/OrderController.cs
View file @
238cb0f7
...
...
@@ -93,7 +93,8 @@ namespace Mall.WebApi.Controllers.MallBase
y
.
ProductCode
,
y
.
Final_Price
,
y
.
Number
,
y
.
IsBindExpress
y
.
IsBindExpress
,
y
.
FreeShippingRemarks
}),
x
.
Consignee
,
x
.
Mobile
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment