diff --git a/app/Controller/NotifyController.php b/app/Controller/NotifyController.php index 80f8b0f..f54b3fc 100644 --- a/app/Controller/NotifyController.php +++ b/app/Controller/NotifyController.php @@ -136,11 +136,11 @@ class NotifyController extends BaseController // 更新商户销量 $upStoreScore = Store::query() - ->whereIn('id', $orderMain->order_ids) + ->whereIn('id', explode(',', $orderMain->store_ids)) ->update(['score' => Db::raw('score+1')]); // 更新商品库存和销量 - $orders = Order::query()->select(['id', 'money', 'user_id', 'store_id', 'createtime']) + $orders = Order::query()->select(['id', 'money', 'user_id', 'store_id']) ->where(['order_main_id' => $orderMain->id]) ->get() ->toArray(); @@ -153,7 +153,7 @@ class NotifyController extends BaseController $goods = Goods::find($goodsItem['id']); // 库存处理,有规格 - if ($goodsItem->combination_id) { + if ($goodsItem['combination_id']) { $combination = SpecCombination::find($goodsItem['combination_id']); $combination->number = $combination->number - $goodsItem['number']; $combination->save(); @@ -168,14 +168,14 @@ class NotifyController extends BaseController // 月销流水 $statistics = []; - foreach ($orders as $key => & $order) { + foreach ($orders as $key => &$order) { $statistics[] = [ - 'money' => $order->money, - 'user_id' => $order->user_id, - 'store_id' => $order->store_id, + 'money' => $order['money'], + 'user_id' => $order['user_id'], + 'store_id' => $order['store_id'], 'market_id' => $orderMain->market_id, - 'order_id' => $order->id, - 'createtime' => strtotime($order->pay_time), + 'order_id' => $order['id'], + 'createtime' => strtotime($order['pay_time']), ]; } diff --git a/app/Model/OrderMain.php b/app/Model/OrderMain.php index 4972484..92213ad 100644 --- a/app/Model/OrderMain.php +++ b/app/Model/OrderMain.php @@ -81,6 +81,7 @@ class OrderMain extends Model 'pay_time', 'jj_note', 'global_order_id', + 'store_ids', ]; } \ No newline at end of file diff --git a/app/Service/OrderService.php b/app/Service/OrderService.php index 2efb470..decf5ab 100644 --- a/app/Service/OrderService.php +++ b/app/Service/OrderService.php @@ -36,10 +36,11 @@ class OrderService implements OrderServiceInterface // 订单判重 $dataMain = $data; + var_dump($dataMain); if ($orderMainId = $this->existsByOrderNum($data['order_num'])) { return $orderMainId; } - + var_dump($orderMainId); Db::beginTransaction(); try { @@ -62,12 +63,12 @@ class OrderService implements OrderServiceInterface Db::rollBack(); return '订单中商品不存在或已失效'; } - +var_dump('storelist', $storeList); // 获取商户IDs foreach ($storeList as &$item) { $dataMain['store_ids'] .= empty($dataMain['store_ids']) ? $item['store_id'] : ','.$item['store_id']; } - + var_dump('$dataMain[\'store_ids\']', $dataMain['store_ids']); // 主订单插入数据 $currentTime = time(); $dataMain['time'] = date('Y-m-d H:i:s', $currentTime);