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
4842128b
Commit
4842128b
authored
Feb 05, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
7c071532
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+3
-6
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+1
-1
No files found.
Mall.Module.Product/OrderModule.cs
View file @
4842128b
...
...
@@ -2685,7 +2685,7 @@ namespace Mall.Module.Product
coupon
=
new
{
enabled
=
true
,
use
=
CouponsMoney
>
0
&&
demodel
.
User_Coupon_Id
>
0
?
true
:
false
,
use
=
CouponsMoney
>
0
&&
demodel
.
User_Coupon_Id
>
0
,
coupon_discount
=
CouponsMoney
,
user_coupon_id
=
CouponsMoney
>
0
?
demodel
.
User_Coupon_Id
??
0
:
0
},
...
...
@@ -14038,16 +14038,13 @@ namespace Mall.Module.Product
{
var
omodel
=
new
RB_Goods_Order
();
int
OrderId
=
0
;
var
dmodel
=
new
RB_Goods_OrderDetail
()
;
RB_Goods_OrderDetail
dmodel
;
if
(
demodel
.
OrderDetailId
>
0
)
{
dmodel
=
goods_OrderDetailRepository
.
GetEntity
(
demodel
.
OrderDetailId
);
if
(
dmodel
==
null
)
{
return
false
;
}
OrderId
=
dmodel
.
OrderId
??
0
;
if
(
dmodel
.
IsComment
==
1
)
{
return
false
;
}
//omodel = goods_OrderRepository.GetEntity(OrderId);
//if (omodel == null) { return false; }
//if (omodel.OrderStatus != OrderStatusEnum.Received) { return false; }
}
bool
flag
=
goods_CommentRepository
.
Insert
(
demodel
)
>
0
;
if
(
flag
)
...
...
@@ -14959,7 +14956,7 @@ namespace Mall.Module.Product
{
item
.
OrderId
=
OrderId
;
//插入订单明细表
int
detailId
=
goods_OrderDetailRepository
.
Insert
(
item
,
trans
);
goods_OrderDetailRepository
.
Insert
(
item
,
trans
);
}
//记录日志
goods_LogRepository
.
Insert
(
new
RB_Goods_Log
()
...
...
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
4842128b
...
...
@@ -238,7 +238,7 @@ namespace Mall.WebApi.Controllers.Education
query
.
TenantId
=
userInfo
.
TenantId
;
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
UserId
=
userInfo
.
UserId
;
RB_Education_Coupon_Extend
resultModel
=
new
RB_Education_Coupon_Extend
()
;
RB_Education_Coupon_Extend
resultModel
;
if
(
query
.
TriggerType
==
2
)
{
query
.
TriggerType
=
4
;
...
...
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