Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
goods
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
bp
goods
Commits
861a57fa
Commit
861a57fa
authored
Aug 17, 2021
by
jianghaiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:Set
parent
18ea4ea3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
GoodsException.php
application/exception/custom/GoodsException.php
+1
-1
GoodsService.php
application/services/goods/GoodsService.php
+2
-2
No files found.
application/exception/custom/GoodsException.php
View file @
861a57fa
...
...
@@ -64,6 +64,6 @@ class GoodsException extends BaseException
45
=>
'还没有try,就去执行confirm'
,
46
=>
'已经执行过cancel'
,
47
=>
'sku rollback error'
,
48
=>
'
商户结算价不能大于分润价加支付
价'
,
48
=>
'
请满足以下条件后提交,售价-分销总金额-手续费>=结算
价'
,
];
}
\ No newline at end of file
application/services/goods/GoodsService.php
View file @
861a57fa
...
...
@@ -760,14 +760,14 @@ class GoodsService
if
(
$marketing
[
"commission_mode"
]
==
Marketing
::
COMMISSION_MODE_RATE
)
{
$commissionTotal
=
(
$marketing
[
"first_commission_value"
]
+
$marketing
[
"second_commission_value"
])
/
10000
*
$price
;
if
((
$price
-
$commissionTotal
-
$chargeFee
)
<
$clearPrice
)
{
throw
new
GoodsException
([
'cus'
=>
4
0
]);
throw
new
GoodsException
([
'cus'
=>
4
8
]);
}
}
if
(
$marketing
[
"commission_mode"
]
==
Marketing
::
COMMISSION_MODE_FIXED
)
{
$commissionTotal
=
(
$marketing
[
"first_commission_value"
]
+
$marketing
[
"second_commission_value"
]);
if
((
$price
-
$commissionTotal
-
$chargeFee
)
<
$clearPrice
)
{
throw
new
GoodsException
([
'cus'
=>
4
0
]);
throw
new
GoodsException
([
'cus'
=>
4
8
]);
}
}
}
...
...
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