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
e108ac6b
Commit
e108ac6b
authored
Sep 21, 2020
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sdzq-ld' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
into sdzq
parents
2d05599b
9fe65747
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+4
-4
FinanceModule.cs
Mall.WindowsService/Module/FinanceModule.cs
+1
-1
No files found.
Mall.Module.Product/OrderModule.cs
View file @
e108ac6b
...
...
@@ -6271,7 +6271,7 @@ namespace Mall.Module.Product
if
(
detailList
.
Any
())
{
string
goodsIds
=
string
.
Join
(
","
,
detailList
.
Select
(
x
=>
x
.
GoodsId
??
0
).
Distinct
());
var
goodsList
=
goodsRepository
.
Get
List
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
}
);
var
goodsList
=
goodsRepository
.
Get
SingleList
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
},
true
);
var
speciPList
=
goods_SpecificationPriceRepository
.
GetList
(
new
RB_Goods_SpecificationPrice_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
});
foreach
(
var
item
in
detailList
)
...
...
@@ -8784,7 +8784,7 @@ namespace Mall.Module.Product
if
(
detailList
.
Any
())
{
string
goodsIds
=
string
.
Join
(
","
,
detailList
.
Select
(
x
=>
x
.
GoodsId
??
0
).
Distinct
());
var
goodsList
=
goodsRepository
.
Get
List
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
}
);
var
goodsList
=
goodsRepository
.
Get
SingleList
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
},
true
);
var
speciPList
=
goods_SpecificationPriceRepository
.
GetList
(
new
RB_Goods_SpecificationPrice_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
});
foreach
(
var
item
in
detailList
)
...
...
@@ -9112,7 +9112,7 @@ namespace Mall.Module.Product
if
(
detailList
.
Any
())
{
string
goodsIds
=
string
.
Join
(
","
,
detailList
.
Select
(
x
=>
x
.
GoodsId
??
0
).
Distinct
());
var
goodsList
=
goodsRepository
.
Get
List
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
}
);
var
goodsList
=
goodsRepository
.
Get
SingleList
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
},
true
);
var
speciPList
=
goods_SpecificationPriceRepository
.
GetList
(
new
RB_Goods_SpecificationPrice_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
});
foreach
(
var
item
in
detailList
)
{
...
...
@@ -11422,7 +11422,7 @@ namespace Mall.Module.Product
var
detailList
=
goods_OrderDetailRepository
.
GetOrderDetailList
(
new
RB_Goods_OrderDetail_Extend
()
{
OrderId
=
orderModel
.
OrderId
});
foreach
(
var
item
in
detailList
)
{
if
(
Convert
.
ToDateTime
(
item
.
TripSTime
.
Value
.
ToString
(
"yyyy-MM-dd"
)).
AddHours
(-
gbmodel
.
CancelHour
)
>
DateTime
.
Now
)
if
(
Convert
.
ToDateTime
(
item
.
TripSTime
.
Value
.
ToString
(
"yyyy-MM-dd"
)).
AddHours
(-
gbmodel
.
CancelHour
)
<
DateTime
.
Now
)
{
return
"订单取消超时,需出发日提前"
+
gbmodel
.
CancelHour
+
"小时"
;
}
...
...
Mall.WindowsService/Module/FinanceModule.cs
View file @
e108ac6b
...
...
@@ -440,7 +440,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
if
(
detailList
.
Any
())
{
string
goodsIds
=
string
.
Join
(
","
,
detailList
.
Select
(
x
=>
x
.
GoodsId
??
0
).
Distinct
());
var
goodsList
=
goodsRepository
.
Get
List
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
}
);
var
goodsList
=
goodsRepository
.
Get
SingleList
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
},
true
);
var
speciPList
=
goods_SpecificationPriceRepository
.
GetList
(
new
RB_Goods_SpecificationPrice_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
});
foreach
(
var
ditem
in
detailList
)
...
...
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