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

Merge pull request 'dev' (#525) from dev into main

Browse Source 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/525
This commit is contained in:
mkm 2025-02-21 09:37:41 +08:00
commit f4460d5dfe
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/controller/LocalController.php
View File

@ -429,6 +429,7 @@ class LocalController extends BaseAdminController
'need_num' => $product['nums'], 'need_num' => $product['nums'],
'mark' => $product['mark'] ?? '', 'mark' => $product['mark'] ?? '',
'buyer_id' => $params['buyer_id'], 'buyer_id' => $params['buyer_id'],
'buyer_confirm' => 1,
'buyer_nums' => $product['nums'], 'buyer_nums' => $product['nums'],
'total_price' => $product['purchase_total'], 'total_price' => $product['purchase_total'],
'status' => 0, 'status' => 0,

4
app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
View File

@ -458,7 +458,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
$purchaseProductOffer['purchase']=$purchaseProductOffer['price']; $purchaseProductOffer['purchase']=$purchaseProductOffer['price'];
$product = StoreProduct::where('id', $purchaseProductOffer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find(); $product = StoreProduct::where('id', $purchaseProductOffer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find();
PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']); if (!in_array($beforehandOrder['order_type'], [6, 9])) {
PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']);
}
Db::commit(); Db::commit();
return true; return true;