Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
liexin_supplier
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a93db6e8
authored
Sep 18, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
a07285e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
app/Http/Services/LogService.php
app/Http/Services/LogService.php
View file @
a93db6e8
...
@@ -98,10 +98,15 @@ class LogService
...
@@ -98,10 +98,15 @@ class LogService
if
(
$key
==
'extra_fee'
)
{
if
(
$key
==
'extra_fee'
)
{
$oldFee
=
json_decode
(
$oldSupplier
[
'extra_fee'
],
true
);
$oldFee
=
json_decode
(
$oldSupplier
[
'extra_fee'
],
true
);
$newFee
=
json_decode
(
$newSupplier
[
'extra_fee'
],
true
);
$newFee
=
json_decode
(
$newSupplier
[
'extra_fee'
],
true
);
$content
=
"采购附加费由 [商品总价不满"
.
$oldFee
[
'cn'
][
'max'
]
.
"元,收取"
.
$oldFee
[
'cn'
][
'price'
]
.
"元;商品总价不满"
.
if
(
empty
(
$oldFee
)
||
empty
(
$newFee
))
{
$oldFee
[
'hk'
][
'max'
]
.
"美金,收取"
.
$oldFee
[
'hk'
][
'price'
]
.
$content
=
'采购附加费修改'
;
"元;] 修改为 [商品总价不满"
.
$newFee
[
'cn'
][
'max'
]
.
"元,收取"
.
$newFee
[
'cn'
][
'price'
]
.
"元;商品总价不满"
.
}
else
{
$newFee
[
'hk'
][
'max'
]
.
"美金,收取"
.
$newFee
[
'hk'
][
'price'
]
.
"元;]"
;
$content
=
"采购附加费由 [商品总价不满"
.
$oldFee
[
'cn'
][
'max'
]
.
"元,收取"
.
$oldFee
[
'cn'
][
'price'
]
.
"元;商品总价不满"
.
$oldFee
[
'hk'
][
'max'
]
.
"美金,收取"
.
$oldFee
[
'hk'
][
'price'
]
.
"元;] 修改为 [商品总价不满"
.
$newFee
[
'cn'
][
'max'
]
.
"元,收取"
.
$newFee
[
'cn'
][
'price'
]
.
"元;商品总价不满"
.
$newFee
[
'hk'
][
'max'
]
.
"美金,收取"
.
$newFee
[
'hk'
][
'price'
]
.
"元;]"
;
}
$result
[]
=
$content
;
$result
[]
=
$content
;
}
}
}
}
...
...
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