diff --git a/app/Command/getProductCommand.php b/app/Command/getProductCommand.php index 4c0107a..c9cb8a0 100644 --- a/app/Command/getProductCommand.php +++ b/app/Command/getProductCommand.php @@ -58,6 +58,10 @@ class getProductCommand extends HyperfCommand if ($result['count'] > $page * $page_size) { for ($i = 2; $i < $count; $i++) { $result = $prescription->getProd($i, $page_size); + if (!isset($result['rows'])){ + continue; + } + foreach ($result['rows'] as $item) { $concurrent->create(function () use($item) { // 执行入库 diff --git a/app/Command/getProductStockCommand.php b/app/Command/getProductStockCommand.php index 235c598..d7a1db8 100644 --- a/app/Command/getProductStockCommand.php +++ b/app/Command/getProductStockCommand.php @@ -55,7 +55,7 @@ class getProductStockCommand extends HyperfCommand for ($i = 2; $i <= $product['last_page']; $i++) { // 获取商品 $params = array(); - $product = Product::getPage($params,['*'],1,10); + $product = Product::getPage($params,['*'],$i,10); if (empty($product['data'])){ $this->line("商品库存更新成功，无可更新库存商品"); return; diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index e180b28..9196e31 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -333,8 +333,8 @@ class TestController extends AbstractController } public function test_15(){ -// $wechat = new Wechat(1); -// $a = $wechat->getAccessToken(); -// dump($a); + $data = new Data(); + + $data->product(); } } \ No newline at end of file diff --git a/app/Middleware/Auth/AuthMiddleware.php b/app/Middleware/Auth/AuthMiddleware.php index 1959694..5263fd1 100644 --- a/app/Middleware/Auth/AuthMiddleware.php +++ b/app/Middleware/Auth/AuthMiddleware.php @@ -81,7 +81,7 @@ class AuthMiddleware implements MiddlewareInterface $res = $redis->get('jwt_black_' . $token); if ($res && time() >= $res) { // token存在黑名单中 - return $this->response->json(fail(HttpEnumCode::HTTP_PROHIBIT)); + return $this->response->json(fail(HttpEnumCode::TOKEN_ERROR)); } // jwt验证 diff --git a/app/Model/Product.php b/app/Model/Product.php index da9132e..2f4b1b7 100644 --- a/app/Model/Product.php +++ b/app/Model/Product.php @@ -158,4 +158,14 @@ class Product extends Model return $data; } + + /** + * 新增 + * @param array $data + * @return \Hyperf\Database\Model\Model|Product + */ + public static function addProduct(array $data): \Hyperf\Database\Model\Model|Product + { + return self::create($data); + } } diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 7108af1..5596271 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -39,6 +39,7 @@ use App\Model\SystemInquiryTime; use App\Model\User; use App\Model\UserDoctor; use App\Model\UserDoctorInfo; +use App\Model\UserPharmacist; use App\Utils\Log; use App\Utils\Mask; use Extend\Alibaba\Oss; @@ -1445,9 +1446,17 @@ class UserDoctorService extends BaseService return fail(HttpEnumCode::SERVER_ERROR, "处方开具失败"); } + // 获取药师数据 + $params = array(); + $user_pharmacist = UserPharmacist::getOne($params); + if (empty($user_pharmacist)){ + Db::rollBack(); + return fail(HttpEnumCode::SERVER_ERROR, "处方开具失败"); + } + // 修改处方表 $data = array(); - $data['pharmacist_id'] = "534534546"; // 药师id 现固定为此用户，后续可以考虑开启队列 + $data['pharmacist_id'] = $user_pharmacist['pharmacist_id']; // 药师id 现固定为此用户，后续可以考虑开启队列 $data['is_auto_phar_verify'] = $system_config['is_auto_phar_verify_prescription'];// 是否药师自动审核（0:否 1:是） $data['doctor_created_time'] = date('Y-m-d H:i:s',time()); diff --git a/app/Utils/Data.php b/app/Utils/Data.php index aca5957..369955b 100644 --- a/app/Utils/Data.php +++ b/app/Utils/Data.php @@ -4,6 +4,8 @@ namespace App\Utils; use App\Model\Area; use App\Model\Hospital; +use App\Model\Product; +use App\Model\ProductPlatform; use App\Model\TbHospitalMy; use Hyperf\DbConnection\Db; use Hyperf\Di\Annotation\Inject; @@ -141,4 +143,67 @@ class Data return success(); } + // 处方平台商品入库 + public function product(){ + $product_platform_id = [ + "517653593319849984", + "517653593307267072", + "517653183070781440", + "517653183108530177", + "517653780314505216", + "517653906961514496", + "517654391143579648", + "517653404613918721", + "517653593365987328", + "517652642206892032", + "517654018844573697", + "517654039933534208", + "517653593282101250", + "517653183154667520", + "517653183074975745", + "517654039895785472", + ]; + + foreach ($product_platform_id as $value){ + $params = array(); + $params['product_platform_id'] = $value; + $product_platform = ProductPlatform::getOne($params); + if (empty($product_platform)){ + continue; + } + + $params = array(); + $params['product_platform_id'] = $value; + $product = Product::getOne($params); + if (empty($product)){ + $data = array(); + $data['product_platform_id'] = $value; + $data['common_name'] = $product_platform['product_name']; + $data['product_price'] = $product_platform['product_price']; + $data['product_type'] = $product_platform['product_type']; + $data['product_platform_code'] = $product_platform['product_platform_code']; + $data['product_pharmacy_code'] = $product_platform['product_pharmacy_code']; + $data['product_spec'] = $product_platform['product_spec']; + $data['license_number'] = $product_platform['license_number']; + $data['manufacturer'] = $product_platform['manufacturer']; + $data['packaging_unit'] = $product_platform['packaging_unit']; + Product::addProduct($data); + }else{ + $params = array(); + $params['product_id'] = $product['product_id']; + + $data = array(); + $data['common_name'] = $product_platform['product_name']; + $data['product_price'] = $product_platform['product_price']; + $data['product_type'] = $product_platform['product_type']; + $data['product_platform_code'] = $product_platform['product_platform_code']; + $data['product_pharmacy_code'] = $product_platform['product_pharmacy_code']; + $data['product_spec'] = $product_platform['product_spec']; + $data['license_number'] = $product_platform['license_number']; + $data['manufacturer'] = $product_platform['manufacturer']; + $data['packaging_unit'] = $product_platform['packaging_unit']; + Product::edit($params,$data); + } + } + } } \ No newline at end of file