diff --git a/app/Amqp/Consumer/SendSmsMessageConsumer.php b/app/Amqp/Consumer/SendSmsMessageConsumer.php index fd7e451..8552bff 100644 --- a/app/Amqp/Consumer/SendSmsMessageConsumer.php +++ b/app/Amqp/Consumer/SendSmsMessageConsumer.php @@ -75,6 +75,7 @@ class SendSmsMessageConsumer extends ConsumerMessage return Result::DROP; // 销毁 } + Log::getInstance()->info("发送短信成功"); return Result::ACK; } diff --git a/app/Controller/UserPatientController.php b/app/Controller/UserPatientController.php index 58f05a0..1737e28 100644 --- a/app/Controller/UserPatientController.php +++ b/app/Controller/UserPatientController.php @@ -5,6 +5,7 @@ namespace App\Controller; use App\Request\UserPatientRequest; use App\Services\MyDoctorService; use App\Services\UserPatientService; +use Hyperf\Snowflake\IdGeneratorInterface; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Psr\Http\Message\ResponseInterface; diff --git a/app/Services/BasicDataService.php b/app/Services/BasicDataService.php index 4bfea91..a640f21 100644 --- a/app/Services/BasicDataService.php +++ b/app/Services/BasicDataService.php @@ -13,6 +13,8 @@ use App\Model\HospitalDepartmentCustom; use App\Model\OperationManual; use App\Model\Product; use Hyperf\Redis\Redis; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; /** * 基础数据服务类 @@ -208,12 +210,14 @@ class BasicDataService extends BaseService /** * 搜索商品 * @return array + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ public function getProductSearch(): array { $user_info = $this->request->getAttribute("userInfo") ?? []; - $product_keyword = $this->request->input('product_keyword'); + $product_keyword = $this->request->input('product_keyword',""); $fields = [ 'product_id', diff --git a/app/Services/CodeService.php b/app/Services/CodeService.php index 8a646d6..5a10091 100644 --- a/app/Services/CodeService.php +++ b/app/Services/CodeService.php @@ -41,7 +41,7 @@ class CodeService extends BaseService $template_code = "SMS_243055263"; $template_param = array(); - $template_param['code'] = mt_rand(1,9) . (int)substr($generator->generate(),-3); + $template_param['code'] = mt_rand(1111,9999); // 发送短信 Dysms::sendSms($phone,$template_param,$template_code,"获取验证码"); diff --git a/app/Services/LoginService.php b/app/Services/LoginService.php index 30d1256..4b9d8c5 100644 --- a/app/Services/LoginService.php +++ b/app/Services/LoginService.php @@ -67,7 +67,8 @@ class LoginService extends BaseService if (empty($user)) { // 处理药师特殊情况,后台添加,前台不允许注册 if ($user_type == 3) { - return fail(HttpEnumCode::GET_WX_ERROR); + Db::rollBack(); + return fail(HttpEnumCode::HTTP_ERROR,"账号不存在,请联系客服"); } // 新增用户表 @@ -264,7 +265,6 @@ class LoginService extends BaseService Log::getInstance()->info($e->getMessage()); } - Db::beginTransaction(); try { @@ -275,7 +275,8 @@ class LoginService extends BaseService if (empty($user)) { // 处理药师特殊情况,后台添加,前台不允许注册 if ($user_type == 3) { - return fail(HttpEnumCode::GET_WX_ERROR); + Db::rollBack(); + return fail(HttpEnumCode::HTTP_ERROR,"账号不存在,请联系客服"); } // 新增用户表