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

调试商品入库到门店

Browse Source
This commit is contained in:
lewis 2025-02-08 14:26:11 +08:00
parent 31320e3961
commit d5e9bbec9a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,7 @@ class BeforehandOrderLogic extends BaseLogic
'cart_id' => '', 'cart_id' => '',
'store_id' => $params['store_id'] ?? 0, 'store_id' => $params['store_id'] ?? 0,
'shipping_type' => 2, //配送方式 1=快递 ，2=门店自提 'shipping_type' => 2, //配送方式 1=快递 ，2=门店自提
'deduction_price' => 0, //抵扣金额 'deduction_price' => $params['deduction_price'] ?? 0, //抵扣金额
'source' => OrderEnum::SOURCE_20, //来源 'source' => OrderEnum::SOURCE_20, //来源
'order_type' => $order['order_type'], 'order_type' => $order['order_type'],
'is_storage' => 0, 'is_storage' => 0,
@ -272,9 +272,12 @@ class BeforehandOrderLogic extends BaseLogic
if ($_order['pay_price'] == 0) { if ($_order['pay_price'] == 0) {
throw new BusinessException('支付金额不能为0'); throw new BusinessException('支付金额不能为0');
} }
if ($_order['deduction_price'] > 0) {
$_order['pay_price'] = bcsub($_order['pay_price'], $_order['deduction_price'], 2);
}
$_order['uid'] = $uid; $_order['uid'] = $uid;
$_order['spread_uid'] = 0; $_order['spread_uid'] = 0;
$_order['mark'] = ''; $_order['mark'] = $params['mark'] ?? '';
$_order['real_name'] = $user['real_name']; $_order['real_name'] = $user['real_name'];
$_order['user_phone'] = $user['mobile']; $_order['user_phone'] = $user['mobile'];
$_order['pay_type'] = $params['pay_type']; $_order['pay_type'] = $params['pay_type'];

2
app/admin/logic/warehouse_product/WarehouseProductLogic.php
View File

@ -129,7 +129,7 @@ class WarehouseProductLogic extends BaseLogic
if ($params['order_type'] != 6) { if ($params['order_type'] != 6) {
$storege = WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id', $params['product_id'])->find(); $storege = WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id', $params['product_id'])->find();
if ($storege) { if ($storege) {
if (in_array($params['order_type'], [1, 4])) { if (($params['store_id'] == 3 && in_array($params['order_type'], [1, 2, 3, 4, 8])) || in_array($params['order_type'], [1, 4])) {
SystemStoreStorage::create([ SystemStoreStorage::create([
'store_id' => $params['store_id'], 'store_id' => $params['store_id'],
'admin_id' => $params['admin_id'], 'admin_id' => $params['admin_id'],

4
app/api/logic/order/OrderLogic.php
View File

@ -290,6 +290,10 @@ class OrderLogic extends BaseLogic
$_order['verify_code'] = $verify_code; $_order['verify_code'] = $verify_code;
$_order['reservation_time'] = null; $_order['reservation_time'] = null;
$_order['reservation'] = 0; $_order['reservation'] = 0;
if (isset($params['deduction_price']) && $params['deduction_price'] > 0) {
$_order['deduction_price'] = $params['deduction_price'];
$_order['pay_price'] = bcsub($_order['pay_price'], $_order['deduction_price'], 2);
}
if ($uid > 0) { if ($uid > 0) {
$address = UserAddress::where(['uid' => $uid])->find(); $address = UserAddress::where(['uid' => $uid])->find();