wechatpay

app/api/controller/PayController.php

@@ -33,7 +33,6 @@ class PayController
 //        if (!$validate->scene('create')->check($params)) {
 //            return json(['code' => 400, 'msg' => $validate->getError()]);
 //        }
-
         // 创建支付订单
         $result = PayService::createPayment(
             $params['user_id'],
@@ -180,25 +179,24 @@ class PayController
         $orderNo = request()->param('order_no');
 
         try {
-            $payment = Db::name('fj_payment')
-                ->where('order_no', $orderNo)
-                ->find();
+            $wechatPayService = new WeChatPayService();
+            $order = $wechatPayService->queryOrderByOutTradeNo($orderNo);
 
-            if (!$payment) {
+            if (!$order) {
                 throw new \Exception("支付订单不存在");
             }
 
-            return json([
-                'code' => 200,
-                'data' => [
-                    'order_no' => $payment['order_no'],
-                    'pay_status' => $payment['pay_status'],
-                    'pay_time' => $payment['pay_time'],
-                    'pay_amount' => $payment['pay_amount']
-                ]
-            ]);
+            $res = json_decode($order, true);
+            if ($res['trade_state'] == 'SUCCESS') {
+                // 处理业务逻辑
+                $res = PayService::handlePaymentNotify($order['out_trade_no'], $order);
+                return json(['code' => 1, 'msg' => 'success','data'=>$res]);
+            }else {
+                throw new \Exception("订单处理失败");
+            }
+
         } catch (\Exception $e) {
-            return json(['code' => 500, 'msg' => $e->getMessage()]);
+            return json(['code' => 0, 'msg' => $e->getMessage()]);
         }
     }
 }
\ No newline at end of file

app/api/controller/User.php

@@ -53,7 +53,7 @@ class User extends BaseController
 
     public function register(Request $request)
     {
-        $vo = (new UserValidate())->goCheck(['name','mobile','password','code']);
+        $vo = (new UserValidate())->goCheck(['name','mobile','password','code','role']);
         if ($vo !== true) {
             return $vo;
         }
@@ -76,6 +76,7 @@ class User extends BaseController
         $user['salt'] = random(4);
         $user['password'] = md5($data['password'].$user['salt']);
         $user['reg_time'] = time();
+        $user['role'] = $data['role'] ?? 1;
         $res = userModel::insert($user);
         if (!$res)
         {

app/api/controller/mine/User.php

@@ -6,9 +6,11 @@ use app\api\controller\PayController;
 use app\api\middleware\Auth;
 use app\api\service\UserService;
 use app\api\service\UtilService;
+use app\api\validate\CertValidate;
 use app\api\validate\CourseValidate;
 use app\api\validate\UserValidate;
 use app\BaseController;
+use app\model\CertOrder;
 use app\model\Course as CourseModel;
 use app\model\project\Mail;
 use app\model\project\UserAccount;
@@ -229,6 +231,56 @@ class User extends BaseController
 
     }
 
+    //证书购买
+    public function buyCert(\think\Request $request)
+    {
+
+        $vo = (new CertValidate())->goCheck(['cert_id']);
+        if ($vo !== true) {
+            return $vo;
+        }
+        $data = $request->param();
+        $userId = $request->userId;
+
+
+        $course = \app\model\Cert::where([
+            'id' => $data['cert_id'],
+            'is_sell' => 1,
+            'is_del' => 0
+        ])->find();
+
+        if (!$course) {
+            return $this->returnMsg('证书不存在');
+        }
+        if ($course['price']<=0)
+        {
+            return $this->returnMsg('免费证书无需购买');
+        }
+
+        $courseOrder = CertOrder::where(['status'=>0,'user_id'=>$userId,'cert_id'=>$course['id']])->count();
+        if (!$courseOrder)
+        {
+            return $this->returnMsg('请先报名');
+        }
+
+        // 验证购买状态（2表示证书类型）
+        if (UtilService::checkPurchase($userId, $data['cert_id'], 2)) {
+            return $this->returnMsg('请勿重复购买');
+        }
+        $params = [
+            'order_id'=>$data['cert_id'],
+            'order_type'=>2,
+            'pay_method'=>$data['pay_method'],
+            'amount'=>$course['price'],
+            'user_id'=>$userId,
+        ];
+
+        $payController = new PayController();
+
+        return $payController->create($params);
+
+    }
+
     public function editPassword(Request $request)
     {
         $vo = (new UserValidate())->goCheck(['confirm_password','password','old_password']);

app/api/service/PayService.php

@@ -32,8 +32,13 @@ class PayService
     public static function createPayment($userId, $orderId, $amount, $payMethod, $orderType, $reqInfo = [])
     {
         try {
+            $orderNoType = match($orderType) {
+                1 => 'kc',
+                2 => 'zs',
+                default => null,
+            };
             // 生成支付订单号
-            $orderNo = UtilService::generateCompactOrderNo($userId,'kc');
+            $orderNo = UtilService::generateCompactOrderNo($userId,$orderNoType);
 
             // 支付订单数据
             $paymentData = [
@@ -156,7 +161,9 @@ class PayService
                 // Db::name('fj_course_order')->where('id', $payment['order_id'])->update(['status' => 1]);
             } elseif ($payment['order_type'] == self::ORDER_TYPE_CERT) {
                 // 处理证书购买逻辑
-                // Db::name('fj_cert_order')->where('id', $payment['order_id'])->update(['status' => 1]);
+                $res = Db::name('cert_order')
+                    ->where('cert_id', $payment['order_id'])
+                    ->update(['status' => 1]);
             }
 
             // 可以添加其他业务逻辑，如发送通知等

app/api/service/WeChatPayService.php

@@ -181,7 +181,7 @@ class WeChatPayService
                 $platformPublicKeyInstance
             );
             if (!$verifiedStatus) {
-//                throw new \Exception("签名验证失败：");
+                throw new \Exception("签名验证失败：");
             }
 
             // 转换通知的JSON文本消息为PHP Array数组

app/api/validate/UserValidate.php

@@ -24,6 +24,7 @@ class UserValidate extends BaseValidate
         'amount'=>'require|chenckAmount',
         'txType'=>'require',
         'reset_token'=>'require',
+        'role'=>'require',
     ];
 
     protected $message  =   [