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
9a422305
Commit
9a422305
authored
May 29, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
结算页面积分+优惠券
parent
54deb488
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
247 additions
and
164 deletions
+247
-164
RB_Goods_OrderDetail_Extend.cs
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
+16
-0
RB_Member_DiscountCoupon_Extend.cs
Mall.Model/Extend/User/RB_Member_DiscountCoupon_Extend.cs
+4
-0
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+224
-164
RB_Member_CouponRepository.cs
Mall.Repository/User/RB_Member_CouponRepository.cs
+3
-0
No files found.
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
View file @
9a422305
...
@@ -13,6 +13,22 @@ namespace Mall.Model.Extend.Product
...
@@ -13,6 +13,22 @@ namespace Mall.Model.Extend.Product
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Goods_OrderDetail_Extend
:
RB_Goods_OrderDetail
public
class
RB_Goods_OrderDetail_Extend
:
RB_Goods_OrderDetail
{
{
/// <summary>
/// 会员优惠
/// </summary>
public
object
Discounts
{
get
;
set
;
}
/// <summary>
/// 属性列表
/// </summary>
public
object
Attr_list
{
get
;
set
;
}
/// <summary>
/// 快递费用
/// </summary>
public
decimal
?
Express
{
get
;
set
;
}
/// <summary>
/// 重量
/// </summary>
public
int
?
GoodsWeight
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 订单ids
/// 订单ids
/// </summary>
/// </summary>
...
...
Mall.Model/Extend/User/RB_Member_DiscountCoupon_Extend.cs
View file @
9a422305
...
@@ -36,6 +36,10 @@ namespace Mall.Model.Extend.User
...
@@ -36,6 +36,10 @@ namespace Mall.Model.Extend.User
/// 优惠卷ids
/// 优惠卷ids
/// </summary>
/// </summary>
public
string
CouponIds
{
get
;
set
;
}
public
string
CouponIds
{
get
;
set
;
}
/// <summary>
/// 用户优惠券id
/// </summary>
public
string
Ids
{
get
;
set
;
}
...
...
Mall.Module.Product/OrderModule.cs
View file @
9a422305
This diff is collapsed.
Click to expand it.
Mall.Repository/User/RB_Member_CouponRepository.cs
View file @
9a422305
...
@@ -63,6 +63,9 @@ namespace Mall.Repository.User
...
@@ -63,6 +63,9 @@ namespace Mall.Repository.User
{
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_DiscountCoupon_Extend
.
CouponId
)}
in (
{
query
.
CouponIds
}
)"
);
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_DiscountCoupon_Extend
.
CouponId
)}
in (
{
query
.
CouponIds
}
)"
);
}
}
if
(!
string
.
IsNullOrEmpty
(
query
.
Ids
))
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_DiscountCoupon_Extend
.
Id
)}
in (
{
query
.
Ids
}
)"
);
}
if
(
query
.
UseState
>=
0
)
if
(
query
.
UseState
>=
0
)
{
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_DiscountCoupon_Extend
.
UseState
)}
=
{
query
.
UseState
}
"
);
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_DiscountCoupon_Extend
.
UseState
)}
=
{
query
.
UseState
}
"
);
...
...
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