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
61af529e
Commit
61af529e
authored
Jun 19, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息订阅推送备注修改
parent
6e2581cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+2
-2
OrderController.cs
Mall.WebApi/Controllers/Product/OrderController.cs
+1
-1
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+1
-1
No files found.
Mall.Module.Product/OrderModule.cs
View file @
61af529e
...
...
@@ -5536,7 +5536,7 @@ namespace Mall.Module.Product
goodsName
=
goodsName
.
Substring
(
0
,
18
)
+
".."
;
}
}
new
MiniProgramMsgModule
().
SendOrderCancelMsg
(
tenantId
,
mallBaseId
,
umodel
.
OpenId
,
omodel
.
OrderNo
,
omodel
.
CancelRemark
??
"
"
,
(
omodel
.
Income
??
0
).
ToString
(),
goodsName
);
new
MiniProgramMsgModule
().
SendOrderCancelMsg
(
tenantId
,
mallBaseId
,
umodel
.
OpenId
,
omodel
.
OrderNo
,
"订单已取消
"
,
(
omodel
.
Income
??
0
).
ToString
(),
goodsName
);
}
//记录日志
string
Content
=
$"客人申请取消订单,审核:
{(
type
==
1
?
"同意"
:
"拒绝"
)}
"
;
...
...
@@ -5757,7 +5757,7 @@ namespace Mall.Module.Product
goodsName
=
goodsName
.
Substring
(
0
,
18
)
+
".."
;
}
}
new
MiniProgramMsgModule
().
SendOrderCancelMsg
(
tenantId
,
mallBaseId
,
umodel
.
OpenId
,
omodel
.
OrderNo
,
omodel
.
CancelRemark
??
"
"
,
(
omodel
.
Income
??
0
).
ToString
(),
goodsName
);
new
MiniProgramMsgModule
().
SendOrderCancelMsg
(
tenantId
,
mallBaseId
,
umodel
.
OpenId
,
omodel
.
OrderNo
,
"订单已取消
"
,
(
omodel
.
Income
??
0
).
ToString
(),
goodsName
);
#
endregion
//记录日志
...
...
Mall.WebApi/Controllers/Product/OrderController.cs
View file @
61af529e
...
...
@@ -1576,7 +1576,7 @@ namespace Mall.WebApi.Controllers.MallBase
var
umodel
=
orderModule
.
GetMemberUserInfo
(
orderModel
.
UserId
??
0
);
if
(
goodsName
!=
""
&&
umodel
!=
null
)
{
new
MiniProgramMsgModule
().
SendOrderRefundMsg
(
orderModel
.
TenantId
,
orderModel
.
MallBaseId
,
umodel
.
OpenId
,
""
,
orderModel
.
OrderNo
,
(
Refund
).
ToString
(),
goodsName
);
new
MiniProgramMsgModule
().
SendOrderRefundMsg
(
orderModel
.
TenantId
,
orderModel
.
MallBaseId
,
umodel
.
OpenId
,
"
已退款,请注意查收
"
,
orderModel
.
OrderNo
,
(
Refund
).
ToString
(),
goodsName
);
}
return
ApiResult
.
Success
(
""
);
}
...
...
Mall.WebApi/Controllers/User/UserController.cs
View file @
61af529e
...
...
@@ -1833,7 +1833,7 @@ namespace Mall.WebApi.Controllers.User
LogHelper
.
Write
(
"提现:"
+
RemitId
+
",失败"
);
}
new
MiniProgramMsgModule
().
SendWithdrawSucceedMsg
(
model
.
TenantId
,
model
.
MallBaseId
,
umodel
.
OpenId
,
(
model
.
RemitMoney
??
0
).
ToString
(),
(
model
.
Fee
??
0
).
ToString
(),
(
model
.
WithdrawalWay
.
GetEnumName
()),
""
);
new
MiniProgramMsgModule
().
SendWithdrawSucceedMsg
(
model
.
TenantId
,
model
.
MallBaseId
,
umodel
.
OpenId
,
(
model
.
RemitMoney
??
0
).
ToString
(),
(
model
.
Fee
??
0
).
ToString
(),
(
model
.
WithdrawalWay
.
GetEnumName
()),
"
已发放佣金,请注意查收
"
);
return
ApiResult
.
Success
();
}
else
...
...
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