1

app/Amqp/Consumer/CancelUnpayOrdersDelayDirectConsumer.php

@@ -4,13 +4,18 @@ declare(strict_types=1);
 
 namespace App\Amqp\Consumer;
 
+use App\Model\OrderInquiry;
+use App\Utils\Log;
 use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
 use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
+use Hyperf\Snowflake\IdGeneratorInterface;
 use PhpAmqpLib\Message\AMQPMessage;
 use Hyperf\Amqp\Message\Type;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * 取消未支付订单消费者-延迟队列
@@ -31,7 +36,55 @@ class CancelUnpayOrdersDelayDirectConsumer extends ConsumerMessage
 
     public function consumeMessage($data, AMQPMessage $message): string
     {
-        dump($data);
+        Log::getInstance()->error("开始执行队列：" . json_encode($data, JSON_UNESCAPED_UNICODE));
+
+        try {
+            // 获取订单数据
+            $params = array();
+            $params['order_inquiry_id'] = $data['order_inquiry_id'];
+            $order_inquiry = OrderInquiry::getOne($params);
+            if (empty($order_inquiry)) {
+                Log::getInstance()->error("队列执行失败原因：未查询到对应订单数据");
+                return Result::DROP;// 销毁
+            }
+
+            // 检测订单状态
+            if ($order_inquiry['inquiry_status'] != 1) {
+                // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
+                Log::getInstance()->error("队列执行失败原因：订单状态为" . $order_inquiry['inquiry_status'] . "无法执行");
+                return Result::DROP;// 销毁
+            }
+
+            if ($order_inquiry['inquiry_refund_status'] != 0 && $order_inquiry['inquiry_refund_status'] != 5) {
+                // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
+                Log::getInstance()->error("队列执行失败原因：订单正在退款中");
+                return Result::DROP;// 销毁
+            }
+
+            if ($order_inquiry['inquiry_pay_status'] == 2) {
+                // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+                Log::getInstance()->error("队列执行失败原因：订单已支付");
+                return Result::DROP;// 销毁
+            }
+
+            // 取消问诊订单
+            $data = array();
+            $data['inquiry_status'] = 7;
+            $data['inquiry_refund_status'] = 2;
+            $data['inquiry_pay_status'] = 5;
+            $data['cancel_time'] = date("Y-m-d H:i:s",time());
+            $data['cancel_reason'] = 5; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
+            $data['updated_at'] = date("Y-m-d H:i:s",time());
+
+            $params = array();
+            $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+            OrderInquiry::edit($params,$data);
+
+            Log::getInstance()->error("队列执行成功");
             return Result::ACK;
+        } catch (\Exception $e) {
+            Log::getInstance()->error("队列执行失败原因：" . $e->getMessage());
+            return Result::REQUEUE; // 重回队列
+        }
     }
 }

app/Controller/UserController.php

@@ -9,7 +9,9 @@ use App\Services\UserDoctorService;
 use App\Services\UserService;
 use App\Utils\Http;
 use Extend\Wechat\Wechat;
+use Extend\Wechat\WechatPay;
 use Hyperf\DbConnection\Db;
+use Hyperf\Snowflake\IdGeneratorInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -65,4 +67,23 @@ class UserController extends AbstractController
         $data = $UserService->putLoginout();
         return $this->response->json($data);
     }
+
+    // 支付测试
+    public function testpay(){
+        $generator = $this->container->get(IdGeneratorInterface::class);
+
+        $WechatPay = new WechatPay(2);
+
+        // 获取预支付交易会话标识
+        $total =  0.01 * 100;
+        $prepay = $WechatPay->getJsapiPrepayId("123456",$total,"o9gYG441zEAHuYoNX7lwFKiQBzKE");
+        if (empty($prepay)){
+            return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
+        }
+
+        // 获取小程序支付配置
+        $pay_config = $WechatPay->getAppletsPayConfig($prepay['prepay_id']);
+        return $this->response->json($pay_config);
+
+    }
 }

app/Model/OrderInquiry.php

@@ -201,4 +201,16 @@ class OrderInquiry extends Model
             ->whereIn('inquiry_status',$inquiry_status_params)
             ->get($fields);
     }
+
+    /**
+     * 修改
+     * @param array $params
+     * @param array $data
+     * @return int
+     */
+    public static function edit(array $params = [], array $data = []): int
+    {
+        return self::where($params)->update($data);
+    }
+
 }

app/Model/PatientFamilyHealth.php

@@ -7,7 +7,6 @@ namespace App\Model;
 
 
 use Hyperf\Database\Model\Collection;
-use Hyperf\Database\Model\Model;
 use Hyperf\Snowflake\Concern\Snowflake;
 
 /**
@@ -71,10 +70,11 @@ class PatientFamilyHealth extends Model
         return self::where($params)->update($data);
     }
 
+
     /**
      * 新增
      * @param array $data
-     * @return Model|PatientFamilyHealth
+     * @return \Hyperf\Database\Model\Model|PatientFamilyHealth
      */
     public static function addPatientFamilyHealth(array $data = []): \Hyperf\Database\Model\Model|PatientFamilyHealth
     {

app/Services/InquiryService.php

@@ -255,17 +255,17 @@ class InquiryService extends BaseService
             $pay_config = $WechatPay->getAppletsPayConfig($prepay['prepay_id']);
 
             // 增加至退款延迟队列
-//            $data = array();
-//            $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-//
-//            $message = new CancelUnpayOrdersDelayDirectProducer($data);
-//            $message->setDelayMs(60 * 30 * 1000);
-//            $producer = $this->container->get(Producer::class) ;
-//            $res = $producer->produce($message);
-//            if(!$res){
-//                Db::rollBack();
-//                return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
-//            }
+            $data = array();
+            $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+
+            $message = new CancelUnpayOrdersDelayDirectProducer($data);
+            $message->setDelayMs(1000 * 60 * 30);
+            $producer = $this->container->get(Producer::class) ;
+            $res = $producer->produce($message);
+            if(!$res){
+                Db::rollBack();
+                return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
+            }
 
             Db::commit();
         } catch (\Exception $e) {

app/Services/PatientFamilyService.php

@@ -732,7 +732,12 @@ class PatientFamilyService extends BaseService
         return success();
     }
 
-    public function addFamilyHealth(){
+    /**
+     * 新增家庭成员-健康情况
+     * @return array
+     */
+    public function addFamilyHealth(): array
+    {
         $user_info = $this->request->getAttribute("userInfo");
         $request_params = $this->request->all();
 
@@ -750,13 +755,37 @@ class PatientFamilyService extends BaseService
         $params['family_id'] = $patient_family['family_id'];
         $params['patient_id'] = $user_info['client_user_id'];
         $patient_family_health = PatientFamilyHealth::getOne($params);
-        if (empty($patient_family_health)) {
+        if (!empty($patient_family_health)) {
             return fail();
         }
 
         $data = array();
         $data['family_id'] = $request_params['family_id'];
+        $data['patient_id'] = $user_info['client_user_id'];
 
+        if (!empty($request_params['disease_class_id'])){
+            // 疾病分类id-系统
+            $data['disease_class_id'] = $request_params['disease_class_id'];
 
+            // 检测疾病是否正确
+            $params = array();
+            $params['disease_class_id'] = $request_params['disease_class_id'];
+            $disease_class = DiseaseClass::getOne($params);
+            if (empty($disease_class)){
+                return fail(HttpEnumCode::HTTP_ERROR,"疾病数据错误");
+            }
+
+            $data['disease_class_name'] = $disease_class['disease_class_name'];
+        }
+
+        $data['diagnosis_date'] = $request_params['diagnosis_date'];
+        $data['diagnosis_hospital'] = $request_params['diagnosis_hospital'];
+        $data['drugs_name'] = $request_params['drugs_name'];
+        $patient_family_health = PatientFamilyHealth::addPatientFamilyHealth($data);
+        if (empty($patient_family_health)){
+            return fail();
+        }
+
+        return success();
     }
 }

app/Utils/Auth.php

@@ -24,6 +24,7 @@ class Auth
             "/area/city" => "get", // 获取城市信息
             "/area/county" => "get", // 获取区县信息
             "/pay/wx/callback" => "post", // 微信支付回调
+            "/testpay" => "get", // 测试
         ];
     }
 

config/routes.php

@@ -399,3 +399,5 @@ Router::addGroup('/im', function () {
     // 修改用户头像
     Router::put('/avatar', [UserController::class, 'putUserAvatar']);
 });
+
+Router::get('/testpay', [UserController::class, 'testpay']);