mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mkm:7ea7dde782effd2da410d456d8ecae9ea05f0aa1
Branches Tags
mkm:main
mkm:dev
mkm:mkm-patch-2
mkm:mkm-patch-1
mkm:update_warehouse_product
mkm:refund
mkm:batch
mkm:updateOrder
mkm:dev3
mkm:bb
mkm:aa
mkm:dev1
mkm:product
mkm:dev_one
mkm:rose
mkm:1.1.4
mkm:1.1.3
mkm:1.1.2
mkm:1.1.1
mkm:1.10.0
mkm:1.0.9
mkm:1.0.8
mkm:1.0.7
mkm:1.0.6
mkm:1.0.5
mkm:1.0.4
mkm:1.0.3
mkm:1.0.2
mkm:1.0.1
mkm:1.0.0
..
compare: mkm:ba6d76de7ec6807d430d6ca586bde158a48f69a6
Branches Tags
mkm:dev
mkm:main
mkm:mkm-patch-2
mkm:mkm-patch-1
mkm:update_warehouse_product
mkm:refund
mkm:batch
mkm:updateOrder
mkm:dev3
mkm:bb
mkm:aa
mkm:dev1
mkm:product
mkm:dev_one
mkm:rose
mkm:1.1.4
mkm:1.1.3
mkm:1.1.2
mkm:1.1.1
mkm:1.10.0
mkm:1.0.9
mkm:1.0.8
mkm:1.0.7
mkm:1.0.6
mkm:1.0.5
mkm:1.0.4
mkm:1.0.3
mkm:1.0.2
mkm:1.0.1
mkm:1.0.0

No commits in common. "7ea7dde782effd2da410d456d8ecae9ea05f0aa1" and "ba6d76de7ec6807d430d6ca586bde158a48f69a6" have entirely different histories.
7ea7dde782 ... ba6d76de7e

1 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

3
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -968,8 +968,7 @@ class BeforehandOrderLogic extends BaseLogic
$v['store_name'] = $find['store_name'];
$v['mark'] = $find['after_sales'];
if (isset($params['type']) && $params['type'] == 2) {
$price = $v['purchase'];
$v['total_price'] = bcmul($v['cost'], $v['nums'], 2);
$price = $v['cost'];
$v['pay_price'] = bcmul($price, $v['nums'], 2);
} else {
if ($v['vip_price'] > 0) {