From dac0e5438447a285d1aaa052e188ca0d44b973f9 Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Fri, 9 Oct 2020 16:06:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E6=92=A4=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=93=81check=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/Implementations/FeiePrintService.php | 10 ++-------- .../v3/Implementations/GoodsActivityService.php | 14 -------------- app/Service/v3/Implementations/GoodsService.php | 10 ---------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php index aa18929..da6faa6 100644 --- a/app/Service/v3/Implementations/FeiePrintService.php +++ b/app/Service/v3/Implementations/FeiePrintService.php @@ -68,11 +68,7 @@ class FeiePrintService implements FeiePrintServiceInterface if (empty($data)) { return ; } - // foreach ($data['order'] as $key => &$item) { - // $item = (array)$item; - // } $printSn = Feprint::query()->where('market_id',$data->market_id)->value('sn'); - $this->log->event('feieprint_rpc', ['printSn' => json_encode($printSn)]); if (env('APP_ENV') === 'dev') { $client = new FeiePrintClient($this->feieHost, $this->feiePort); $msgInfo = array( @@ -94,9 +90,7 @@ class FeiePrintService implements FeiePrintServiceInterface } } $content = $this->printFormat($data, 4, 14, 7, 7); - $this->log->event('feieprint_rpc', ['content' => json_encode($content)]); $res = $this->printMsg($printSn, $content, 1); - $this->log->event('feieprint_rpc', ['res' => json_encode($res)]); return $res; } @@ -201,8 +195,8 @@ class FeiePrintService implements FeiePrintServiceInterface } $total = '合计：'.$arr->money; $userName = $arr->name; - if(strlen($userName)>18){ - $userName=substr($userName,0,18).'...'; + if(mb_strlen($userName)>18){ + $userName=mb_substr($userName,0,18).'...'; } $userLength = preg_replace('/[^\x{4e00}-\x{9fa5}]/u', '', $userName); $totalLength = preg_replace('/[^\x{4e00}-\x{9fa5}]/u', '', $total); diff --git a/app/Service/v3/Implementations/GoodsActivityService.php b/app/Service/v3/Implementations/GoodsActivityService.php index 77ea89b..84edb90 100644 --- a/app/Service/v3/Implementations/GoodsActivityService.php +++ b/app/Service/v3/Implementations/GoodsActivityService.php @@ -40,29 +40,21 @@ class GoodsActivityService implements GoodsActivityServiceInterface { if (empty($goods)) { - $message = ErrorCode::getMessage(ErrorCode::GOODS_ACTIVITY_NOT_EXISTS); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ACTIVITY_NOT_EXISTS; } // 活动是否已经结束 if ($goods->expire_time < time()) { - $message = ErrorCode::getMessage(ErrorCode::GOODS_ACTIVITY_EXPIRED); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ACTIVITY_EXPIRED; } // 商户歇业 if($goods->store->is_rest == 1){ - $message = ErrorCode::getMessage(ErrorCode::STORE_REST); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::STORE_REST; } // 商品下架或已删除 if($goods->on_sale == 0 || !is_null($goods->deleted_at)){ - $message = ErrorCode::getMessage(ErrorCode::GOODS_ACTIVITY_ON_SALE_NO); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ACTIVITY_ON_SALE_NO; } @@ -71,15 +63,11 @@ class GoodsActivityService implements GoodsActivityServiceInterface $inventoryFrozen = $this->goodsInventoryService->getSold(2, $goods->id); // $inventoryFrozen = 0; if($goods->is_infinite != 1 && $goods->inventory < ($num+$inventoryFrozen)){ - $message = ErrorCode::getMessage(ErrorCode::GOODS_ACTIVITY_INVENTORY_ERROR); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'activity_type' => 2, 'inventoryFrozen' => $inventoryFrozen, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ACTIVITY_INVENTORY_ERROR; } // 是否超过限购数量 if ($goods->restrict_num != 0 && $goods->restrict_num < $num) { - $message = ErrorCode::getMessage(ErrorCode::GOODS_ACTIVITY_RESTRICT_LIMIT); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ACTIVITY_RESTRICT_LIMIT; } @@ -87,8 +75,6 @@ class GoodsActivityService implements GoodsActivityServiceInterface $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class); $hasBuy = $ssdb->exec('get', SsdbKeys::ACTIVITY_GOODS_BUY_RECORD.$userId.'_'.$goods->type.'_'.$goods->id); if ($hasBuy && $hasBuy >= $goods->time_limit_num) { - $message = ErrorCode::getMessage(ErrorCode::GOODS_ACTIVITY_BUY); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'has_buy' => $hasBuy, 'ssdb_key' => SsdbKeys::ACTIVITY_GOODS_BUY_RECORD.$userId.'_'.$goods->type.'_'.$goods->id, 'buy_num' => $num, 'user_id' => $userId, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ACTIVITY_BUY; } diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php index da6626a..25bf28c 100644 --- a/app/Service/v3/Implementations/GoodsService.php +++ b/app/Service/v3/Implementations/GoodsService.php @@ -36,21 +36,15 @@ class GoodsService implements GoodsServiceInterface { if (empty($goods)) { - $message = ErrorCode::getMessage(ErrorCode::GOODS_NOT_EXISTS); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_NOT_EXISTS; } // 商户歇业 if($goods->store->is_rest == 1){ - $message = ErrorCode::getMessage(ErrorCode::STORE_REST); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'logData' => json_encode($goods)]); return ErrorCode::STORE_REST; } // 商品下架或已删除 if($goods->on_sale == 0 || !is_null($goods->deleted_at)){ - $message = ErrorCode::getMessage(ErrorCode::GOODS_ON_SALE_NO); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_ON_SALE_NO; } // 商品库存不足 @@ -58,15 +52,11 @@ class GoodsService implements GoodsServiceInterface // $inventoryFrozen = $this->goodsInventoryService->getSold(1, $goods->id); $inventoryFrozen = 0; if($goods->is_infinite != 1 && $goods->inventory < ($num+$inventoryFrozen)){ - $message = ErrorCode::getMessage(ErrorCode::GOODS_INVENTORY_ERROR); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'inventoryFrozen' => $inventoryFrozen, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_INVENTORY_ERROR; } // 是否超过限购数量 if ($goods->restrict_num != 0 && $goods->restrict_num < $num) { - $message = ErrorCode::getMessage(ErrorCode::GOODS_RESTRICT_LIMIT); - $this->log->event(LogLabel::ERROR_CODE_EXCEPTION_LOG_DATA, ['message' => $message, 'buy_num' => $num, 'logData' => json_encode($goods)]); return ErrorCode::GOODS_RESTRICT_LIMIT; }