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
ef0a6cdd
Commit
ef0a6cdd
authored
Jul 02, 2020
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
parents
4554fa9d
3c829cee
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
154 additions
and
14 deletions
+154
-14
UserSourceEnum.cs
Mall.Common/Enum/User/UserSourceEnum.cs
+6
-1
RB_Goods_OrderAfterSale_Extend.cs
Mall.Model/Extend/Product/RB_Goods_OrderAfterSale_Extend.cs
+9
-0
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+7
-2
RB_Goods_OrderAfterSaleRepository.cs
Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs
+6
-0
TimersHelper.cs
Mall.WindowsService/Helper/TimersHelper.cs
+6
-0
FinanceModule.cs
Mall.WindowsService/Module/FinanceModule.cs
+120
-11
No files found.
Mall.Common/Enum/User/UserSourceEnum.cs
View file @
ef0a6cdd
...
...
@@ -31,6 +31,11 @@ namespace Mall.Common.Enum.User
/// 百度
/// </summary>
[
EnumField
(
"百度"
)]
Baidu
=
4
Baidu
=
4
,
/// <summary>
/// H5站点
/// </summary>
[
EnumField
(
"H5"
)]
H5
=
5
}
}
Mall.Model/Extend/Product/RB_Goods_OrderAfterSale_Extend.cs
View file @
ef0a6cdd
...
...
@@ -74,5 +74,14 @@ namespace Mall.Model.Extend.Product
/// 凭证列表
/// </summary>
public
List
<
string
>
VoucherList
{
get
;
set
;
}
/// <summary>
/// 完成开始时间
/// </summary>
public
string
FStartTime
{
get
;
set
;
}
/// <summary>
/// 完成结束时间
/// </summary>
public
string
FEndTime
{
get
;
set
;
}
}
}
Mall.Module.Product/OrderModule.cs
View file @
ef0a6cdd
...
...
@@ -5564,6 +5564,7 @@ namespace Mall.Module.Product
if
(
type
==
1
)
{
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
OrderStatus
),
OrderStatusEnum
.
Cancel
);
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
CancelTime
),
DateTime
.
Now
);
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
ApplyForCancelStatus
),
1
);
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
RefundOrderNo
),
RefundOrderNo
);
}
...
...
@@ -5828,6 +5829,7 @@ namespace Mall.Module.Product
{
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
};
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
OrderStatus
),
OrderStatusEnum
.
Cancel
);
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
CancelTime
),
DateTime
.
Now
);
keyValues
.
Add
(
nameof
(
RB_Goods_Order
.
RefundOrderNo
),
RefundOrderNo
);
if
(
omodel
.
OrderStatus
!=
OrderStatusEnum
.
NonPayment
)
{
...
...
@@ -6050,8 +6052,11 @@ namespace Mall.Module.Product
goods_OrderRepository
.
DBSession
.
Commit
();
if
(
flag
&&
tenantId
==
1
)
{
//同意 创建财务单据
OrderRefundFinanceModule
(
omodel
,
true
);
if
(
omodel
.
OrderStatus
!=
OrderStatusEnum
.
NonPayment
)
{
//同意 创建财务单据
OrderRefundFinanceModule
(
omodel
,
true
);
}
}
return
flag
;
}
...
...
Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs
View file @
ef0a6cdd
...
...
@@ -191,6 +191,12 @@ INNER JOIN rb_member_user mu on mu.Id=oas.UserId
{
where
+=
$" and oas.
{
nameof
(
RB_Goods_OrderAfterSale
.
OrderDetialId
)}
in(
{
dmodel
.
OrderDetailIds
}
)"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
FStartTime
))
{
where
+=
$" and oas.
{
nameof
(
RB_Goods_OrderAfterSale
.
FinishTime
)}
>='
{
dmodel
.
FStartTime
}
'"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
FEndTime
))
{
where
+=
$" and oas.
{
nameof
(
RB_Goods_OrderAfterSale
.
FinishTime
)}
<='
{
dmodel
.
FEndTime
}
23:59:59'"
;
}
string
sql
=
$@"SELECT oas.* FROM rb_goods_orderaftersale oas
{
where
}
order by oas.ReOrderId desc"
;
return
Get
<
RB_Goods_OrderAfterSale_Extend
>(
sql
).
ToList
();
...
...
Mall.WindowsService/Helper/TimersHelper.cs
View file @
ef0a6cdd
...
...
@@ -29,6 +29,12 @@ namespace Mall.WindowsService.Helper
Module
.
FinanceModule
.
OrderIncomeFinanceModule
();
LogHelper
.
Write
(
"RevenueFinance=====End"
);
#
region
退款制单
LogHelper
.
Write
(
"AutoCreateFinanceRefund=====Start"
);
Module
.
FinanceModule
.
AutoCreateFinanceRefund
();
LogHelper
.
Write
(
"AutoCreateFinanceRefund=====End"
);
#
endregion
Interlocked
.
Exchange
(
ref
inTimer
,
0
);
}
}
...
...
Mall.WindowsService/Module/FinanceModule.cs
View file @
ef0a6cdd
This diff is collapsed.
Click to expand it.
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