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
0a9b8f20
Commit
0a9b8f20
authored
Sep 03, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面下修改
parent
9e1e2af2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
15 deletions
+16
-15
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+16
-15
No files found.
Mall.Module.Product/ProductModule.cs
View file @
0a9b8f20
...
...
@@ -1646,8 +1646,12 @@ namespace Mall.Module.Product
}
}
}
MaxSellMoney
=
model
.
SpecificationPriceList
.
Max
(
x
=>
x
.
SellingPrice
??
0
);
model
.
SellingPrice
=
model
.
SpecificationPriceList
.
Min
(
x
=>
x
.
SellingPrice
??
0
);
if
(
model
.
SpecificationPriceList
!=
null
&&
model
.
SpecificationPriceList
.
Count
>
0
)
{
MaxSellMoney
=
model
.
SpecificationPriceList
.
Max
(
x
=>
x
.
SellingPrice
??
0
);
model
.
SellingPrice
=
model
.
SpecificationPriceList
.
Min
(
x
=>
x
.
SellingPrice
??
0
);
}
decimal
MaxPrice
=
MaxSellMoney
+
Math
.
Ceiling
(
MaxSellMoney
/
10
);
if
(
MaxPrice
>
model
.
OriginalPrice
)
{
...
...
@@ -2461,9 +2465,6 @@ namespace Mall.Module.Product
}
}
List
<
RB_Goods_Preferential_Extend
>
goodsPreferentialList
=
new
List
<
RB_Goods_Preferential_Extend
>();
goodsPreferentialList
=
RB_Goods_PreferentialRepository
.
GetGoodsPreferentialListRepostory
(
new
RB_Goods_Preferential_Extend
{
TenantId
=
model
.
TenantId
,
MallBaseId
=
model
.
MallBaseId
,
GoodsId
=
model
.
Id
});
...
...
@@ -2479,9 +2480,9 @@ namespace Mall.Module.Product
categoryIdList
=
model
?.
CategoryList
?.
Select
(
x
=>
x
.
CategoryId
??
0
).
ToList
(),
status
=
model
.
GoodsStatus
,
isAllowShare
=
IsAllowShare
,
//是否可以分享
advertising
=
model
.
Advertising
,
//广告词
advertising
=
model
?.
Advertising
??
""
,
//广告词
price
=
model
.
SellingPrice
,
sendArea
=
model
.
SendArea
,
sendArea
=
model
?.
SendArea
??
""
,
use_attr
=
model
.
IsCustomSpecification
,
attr_groups
=
model
.
SpecificationList
.
Select
(
x
=>
new
{
...
...
@@ -2511,8 +2512,8 @@ namespace Mall.Module.Product
is_level_alone
=
model
.
SeparateSetMember
,
//是否单独设置会员价
share_type
=
model
.
SeparateDistributionMoneyType
,
//分销佣金类型
//sign = "",
app_share_pic
=
model
.
CustomShareImagePath
,
app_share_title
=
model
.
CustomShareTitles
,
app_share_pic
=
model
?.
CustomShareImagePath
??
""
,
app_share_title
=
model
?.
CustomShareTitles
??
""
,
is_default_services
=
model
.
IsDefaultService
,
sort
=
model
.
Sort
,
created_at
=
model
.
CreateDate
.
HasValue
?
model
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
...
...
@@ -2533,12 +2534,12 @@ namespace Mall.Module.Product
form_id
=
model
.
FormsId
,
sales
=
(
model
.
SalesNum
??
0
)
+
payment_num
,
//已售出数量 + 订单商品数量//
name
=
model
.
Name
,
subname
=
model
.
SubName
,
subname
=
model
?.
SubName
??
""
,
original_price
=
model
.
OriginalPrice
,
cover_pic
=
model
.
CoverImage
,
unit
=
model
.
Unit
,
detail
=
model
.
GoodsDetails
,
video_url
=
model
.
VideoAddress
,
video_url
=
model
?.
VideoAddress
??
""
,
level_show
=
(
userModel
?.
MemberGrade
??
0
)
>
0
?
1
:
2
,
//是否显示会员价
is_sales
=
model
.
GoodsStatus
==
1
&&
model
.
InventoryNum
>
0
?
1
:
2
,
//是否可购买
attr
=
priceList
,
...
...
@@ -2597,10 +2598,10 @@ namespace Mall.Module.Product
is_quick_shop
=
model
.
IsQuickBuy
,
is_sell_well
=
model
.
IsSellWell
,
is_negotiable
=
model
.
IsGoodsNegotiable
,
freeShippingName
=
model
.
FreeShippingModel
.
Name
,
fullMoneyPinkage
=
model
.
FreeShippingModel
.
FullMoneyPinkage
??
0
,
fullNumPinkage
=
model
.
FreeShippingModel
.
FullNumPinkage
??
0
,
freeShippingUrl
=
model
.
FreeShippingModel
.
FreeShippingUrl
,
freeShippingName
=
model
.
FreeShippingModel
?.
Name
??
""
,
fullMoneyPinkage
=
model
.
FreeShippingModel
?
.
FullMoneyPinkage
??
0
,
fullNumPinkage
=
model
?.
FreeShippingModel
?
.
FullNumPinkage
??
0
,
freeShippingUrl
=
model
?.
FreeShippingModel
?
.
FreeShippingUrl
,
marketingLogo
=
JsonHelper
.
Serialize
(
tempLogo
),
//分类
cats
=
model
.
CategoryList
.
Select
(
x
=>
new
...
...
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