Commit a93db6e8 by mushishixian

fix

parent a07285e3
Showing with 9 additions and 4 deletions
...@@ -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;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment