From 2889e1897030ecffded1485571dd0036eb56cf8c Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Wed, 3 Feb 2021 21:12:01 +0800
Subject: [PATCH] bug修改
---
application/admin/controller/shopro/order/Order.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/application/admin/controller/shopro/order/Order.php b/application/admin/controller/shopro/order/Order.php
index 30be4cc..b59a8d5 100644
--- a/application/admin/controller/shopro/order/Order.php
+++ b/application/admin/controller/shopro/order/Order.php
@@ -980,13 +980,11 @@ class Order extends Base
$order = $this->model->payed()->where('id', $insert_order['order_id'])->find();
$item_where = [
'order_id' => $insert_order['order_id'],
- 'goods_title' => $insert_order['goods_title']
+ 'goods_title' => $insert_order['goods_title'],
+ 'dispatch_status' => \app\admin\model\shopro\order\OrderItem::DISPATCH_STATUS_NOSEND
];
if($dealer){
- $item_where = array_merge([
- 'dealer_id' => $dealer['id'],
- 'dispatch_status' => \app\admin\model\shopro\order\OrderItem::DISPATCH_STATUS_NOSEND
- ],$item_where);
+ $item_where['dealer_id'] = $dealer['id'];
}
$item = \app\admin\model\shopro\order\OrderItem::where($item_where)->find();
if($order && $item){
--
libgit2 0.24.0