From 3b3a3601dae7b5b37663503e016f430ead3b45e8 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Thu, 8 Jul 2021 15:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.php            |  5 +++--
 src/Action/CouponAction.php  | 26 ++++++++++++++++++++++----
 src/Models/WashcarCoupon.php |  6 ++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/config/config.php b/config/config.php
index 7c7f1b2..33f5c83 100644
--- a/config/config.php
+++ b/config/config.php
@@ -18,8 +18,8 @@ return [
         'tokenUri'      => 'https://open.cyzl.com/beta/auth/oauth/token',
         'baseUri'       => 'https://open.cyzl.com/beta/api',
         'indexUri'      => 'https://v.cyzl.com/beta/activity/helongjiangWashCar/index.html?activityId={{activityId}}#/?accessToken={{accessToken}}',
-        'infoUri'       => 'https://v.cyzl.com/beta/xtz-v2/portal/index.html?activityId={{activityId}}#/heilongjiang-car-ticketInfo?ticketCode={{ticketCode}}&isShowHead=1&accessToken={{accessToken}}',
         //优惠券详情地址
+        'infoUri'       => 'https://v.cyzl.com/beta/xtz-v2/portal/index.html?activityId={{activityId}}&activityNo=heilongjiang#/car-ticketInfo?ticketCode={{ticketCode}}&isShowHead=1&accessToken={{accessToken}}',
     ],
 
     /**
@@ -32,9 +32,10 @@ return [
         'grant_type'    => 'client_credentials',
         'tokenUri'      => 'https://open.cyzl.com/api/auth/oauth/token',
         'baseUri'       => 'https://open.cyzl.com/api',
+        //首页购买页
         'indexUri'      => 'https://v.cyzl.com/activity/helongjiangWashCar/index.html?activityId={{activityId}}#/?accessToken={{accessToken}}',
-        'infoUri'       => 'https://v.cyzl.com/xtz-v2/portal/index.html?activityId={{activityId}}#/heilongjiang-car-ticketInfo?ticketCode={{ticketCode}}&isShowHead=1&accessToken={{accessToken}}',
         //优惠券详情地址
+        'infoUri'       => 'https://v.cyzl.com/xtz-v2/portal/index.html?activityId={{activityId}}&activityNo=heilongjiang#/car-ticketInfo?ticketCode={{ticketCode}}&isShowHead=1&accessToken={{accessToken}}',
     ],
 
 ];
diff --git a/src/Action/CouponAction.php b/src/Action/CouponAction.php
index b2700e6..bedc3b0 100644
--- a/src/Action/CouponAction.php
+++ b/src/Action/CouponAction.php
@@ -123,13 +123,31 @@ class CouponAction extends Init
      */
     public function callback()
     {
-        $couponCode = $this->params['couponCode'];
-        $verifyTime = $this->params['verifyTime'];
-        $this->url  = $this->params['url'];
+        $validator = \Validator::make($this->params, [
+            'couponCode' => 'required',
+            'verifyTime' => 'required',
+            'url'        => 'required',
+        ], [
+            'couponCode.required' => '缺少参数：couponCode',
+            'verifyTime.required' => '缺少参数：verifyTime',
+            'url.required'        => '缺少参数：url',
+        ]);
+
+        if ($validator->fails()) {
+            $this->error   = 999;
+            $this->message = $validator->errors()->first();
+
+            return $this->getResponse();
+
+        }
 
         //插入日志
         $this->addLog($this->params);
 
+        $couponCode = $this->params['couponCode'];
+        $verifyTime = $this->params['verifyTime'];
+        $this->url  = $this->params['url'];
+
         $coupon = Coupon::where('code', $couponCode)->first();
 
         if ($coupon) {
@@ -137,7 +155,7 @@ class CouponAction extends Init
             if (in_array($coupon->status, [Coupon::STATUS_INIT, Coupon::STATUS_ERROR])) {
                 $coupon->status  = Coupon::STATUS_USED;
                 $coupon->used_at = $verifyTime;
-                $coupon->source  = $request->all();
+                $coupon->source  = $this->params;
                 $coupon->save();
 
                 CouponLog::create([
diff --git a/src/Models/WashcarCoupon.php b/src/Models/WashcarCoupon.php
index 47d90e5..444e172 100644
--- a/src/Models/WashcarCoupon.php
+++ b/src/Models/WashcarCoupon.php
@@ -3,6 +3,7 @@
 namespace XuanChen\WashCar\Models;
 
 use Carbon\Carbon;
+use XuanChen\WoUnicom\Action\Order;
 
 class WashcarCoupon extends Model
 {
@@ -22,4 +23,9 @@ class WashcarCoupon extends Model
         self::STATUS_ERROR   => '失败',
     ];
 
+    public function order()
+    {
+        return $this->morphTo();
+    }
+
 }