From 609df80881fb1ae023cd4820af07a31f31ef03cb Mon Sep 17 00:00:00 2001 From: ctexthuang Date: Wed, 9 Apr 2025 15:31:11 +0800 Subject: [PATCH] feat : rank --- app/Amqp/Consumer/Statement/FinancesConsumer.php | 10 +++++----- app/Model/OrderGood.php | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Amqp/Consumer/Statement/FinancesConsumer.php b/app/Amqp/Consumer/Statement/FinancesConsumer.php index 20dba94..df208bf 100644 --- a/app/Amqp/Consumer/Statement/FinancesConsumer.php +++ b/app/Amqp/Consumer/Statement/FinancesConsumer.php @@ -90,10 +90,10 @@ class FinancesConsumer extends ConsumerMessage 'data' => $data, ])); } - $this->log->error('FinancesConsumer1'); + $statementInfo = $this->financesStatementModel->getStatementByCycleIdAndKitchenId((int)$data['cycle_id'],(int)$data['kitchen_id']); if (!empty($statementInfo)) $statementInfo->delete(); - $this->log->error('FinancesConsumer2'); + $statement = new FinancesStatement(); $statement->date = $cycle->dates; @@ -106,21 +106,21 @@ class FinancesConsumer extends ConsumerMessage $statement->option_copies = $this->orderModel->getCopiesByCycleIdAndKitchenId($cycle->id, $kitchen->id, OrderCode::ORDER_TYPE_OPTIONAL); $statement->meal_order_number = $this->orderModel->getOrderNumberByCycleIdAndKitchenId($cycle->id, $kitchen->id, OrderCode::ORDER_TYPE_MEAL); $statement->meal_copies = $this->orderModel->getCopiesByCycleIdAndKitchenId($cycle->id, $kitchen->id, OrderCode::ORDER_TYPE_MEAL); - $this->log->error('FinancesConsumer3'); + if (!$statement->save()) { throw new Exception('FinancesConsumer:error:FinancesStatement:'.json_encode([ 'statement' => $statement, 'data' => $data, ])); } - $this->log->error('FinancesConsumer4'); + // 厨师商品结算节点 消息队列 - 生成结算数据 $chefMessage = new ChefProducer([ 'cycle_id' => $data['cycle_id'], 'kitchen_id' => $data['kitchen_id'], ]); $this->producer->produce($chefMessage); - $this->log->error('FinancesConsumer5'); + return Result::ACK; } catch (Exception $e) { $this->log->error($e->getMessage()); diff --git a/app/Model/OrderGood.php b/app/Model/OrderGood.php index 66ddb9d..e38c948 100644 --- a/app/Model/OrderGood.php +++ b/app/Model/OrderGood.php @@ -18,7 +18,8 @@ use Hyperf\DbConnection\Model\Model; * @property int $quantity * @property string $unit_price * @property int $is_comment - * @property int $copies + * @property int $copies + * @property int $status * @property int $type * @property string $create_time * @property string $update_time