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

Merge pull request '暂时回滚采购单' (#397) from dev into main

Browse Source 
Reviewed-on: #397
This commit is contained in:
mkm 2024-12-18 17:47:21 +08:00
commit 3b10f93790
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,7 +678,7 @@ class BeforehandOrderLogic extends BaseLogic
{
$order_info = new OrderInfo();
$order = BeforehandOrder::where('id', $params['id'])->find();
if ($order['order_type'] == 7 && $params['print'] == 1) {
if ($order['order_type'] == 7 && isset($params['print']) && $params['print'] == 1) {
$order->is_buying = 1;
$order->save();
}

12
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

@ -41,23 +41,13 @@ class PurchaseProductOfferLogic extends BaseLogic
{
Db::startTrans();
try {
$procurementOrder = BeforehandOrder::where('order_type', 7)->where('is_buying', 0)->find();
if (empty($procurementOrder)) {
$beforeOrder = BeforehandOrder::where('id', $params['order_id'])->findOrEmpty()->toArray();
unset($beforeOrder['id'], $beforeOrder['create_time'], $beforeOrder['update_time']);
$procurementOrder = new BeforehandOrder();
$procurementOrder->setAttrs($beforeOrder);
$procurementOrder->order_id = getNewOrderId('CG');
$procurementOrder->order_type = 7;
$procurementOrder->save();
}
$mark = $params['mark'] ?? '';
if ($mark == '') {
$mark = BeforehandOrderCartInfo::where('bhoid', $params['order_id'])->where('product_id', $params['product_id'])->value('mark');
}
$find=StoreProduct::where('id',$params['product_id'])->find();
PurchaseProductOffer::create([
'order_id' => $procurementOrder['id'],
'order_id' => $params['order_id'],
'product_id' => $params['product_id'],
'unit' => $params['unit'],
'is_buyer' => $params['is_buyer'],