修改四肢

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "xuanchen/washcar",
-    "description": "平安sdk",
+    "description": "洗车券",
     "license": "MIT",
     "homepage": "http://git.yuzhankeji.cn/xuanchen/PingAnWashCar.git",
     "authors": [

config/config.php

@@ -6,31 +6,36 @@ return [
      * 平安洗车券
      */
 
-    'this_type' => 'test',
+    'this_type' => env('WASH_TYPE'),
     /**
      * 测试环境参数
      */
     'test'      => [
-        'client_id'     => env('WASH_CAR_APPID', ''),//就是 appId
+        'client_id'     => env('WASH_CAR_TEST_APPID', ''),//就是 appId
-        'client_secret' => env('WASH_CAR_SECRET', ''),// 就是 client_secret
+        'client_secret' => env('WASH_CAR_TEST_SECRET', ''),// 就是 client_secret
         'apiVersion'    => 'v2',
         'grant_type'    => 'client_credentials',
-        'tokenUri'      => 'https://open.cyzl.com/beta/api/auth/oauth/token',
+        'tokenUri'      => 'https://open.cyzl.com/beta/auth/oauth/token',
         'baseUri'       => 'https://open.cyzl.com/beta/api',
-        'urlKey'        => env('WASH_CAR_URLKEY', ''),//免登陆跳转
+        '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}}&activityNo=default#/car-ticketInfo?ticketCode={{ticketCode}}&isShowHead=1&accessToken={{accessToken}}',
     ],
 
     /**
      * 生产环境参数
      */
     'dev'       => [
-        'client_id'     => env('WASH_CAR_APPID', ''),//就是 appId
+        'client_id'     => env('WASH_CAR_DEV_APPID', ''),//就是 appId
-        'client_secret' => env('WASH_CAR_SECRET', ''),// 就是 client_secret
+        'client_secret' => env('WASH_CAR_DEV_SECRET', ''),// 就是 client_secret
         'apiVersion'    => 'v2',
         'grant_type'    => 'client_credentials',
-        'tokenUri'      => 'https://open.cyzl.com/api/auth/oauth/token',
+        'tokenUri'      => 'https://open.cyzl.com/auth/oauth/token',
         'baseUri'       => 'https://open.cyzl.com/api',
-        'urlKey'        => env('WASH_CAR_URLKEY', ''),//免登陆跳转
+        //首页购买页
+        '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}}&activityNo=default#/car-ticketInfo?ticketCode={{ticketCode}}&isShowHead=1&accessToken={{accessToken}}',
     ],
 
 ];

database/migrations/0000_00_00_000000_create_washcar_coupons_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateWashcarCouponsTable extends Migration
+{
+
+    /**
+     * Run the migrations.
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('washcar_coupons', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->morphs('order');
+            $table->string('code');
+            $table->boolean('status')->default(1);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('washcar_coupons');
+    }
+
+}

database/migrations/0000_00_00_000000_create_washcar_logs_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateWashcarLogsTable extends Migration
+{
+
+    /**
+     * Run the migrations.
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('washcar_logs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('url')->comment('地址');
+            $table->text('in_source')->comment('入参');
+            $table->text('out_source')->comment('出参')->nullable();
+            $table->boolean('status')->default(1);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('washcar_logs');
+    }
+
+}

src/Action/BaseAction.php

@@ -5,9 +5,21 @@ namespace XuanChen\WashCar\Action;
 class BaseAction extends Init
 {
 
-    public function index()
+    /**
+     * Notes: 免登陆
+     * @Author: 玄尘
+     * @Date  : 2021/6/29 10:49
+     * @param  string  $method
+     * @return array
+     */
+    public function getUnLoginUrl($method = 'POST')
     {
-        return 1;
+        $url = $this->config['baseUri'] . '/v2/h5/redirect/autoLogin/commonReturnUrl';
+
+        $params = $this->getParams();
+        $this->http($url, $params, $method);
+
+        return $this->getResponse();
     }
 
 }

src/Action/CouponAction.php

@@ -2,9 +2,54 @@
 
 namespace XuanChen\WashCar\Action;
 
+use App\Models\Coupon;
+use App\Models\CouponLog;
+
 class CouponAction extends Init
 {
 
+    /**
+     * Notes: 跳转到下单url
+     * @Author: 玄尘
+     * @Date  : 2021/6/4 14:11
+     */
+    public function getOrderUrl()
+    {
+        $callback_url = $this->config['indexUri'];
+
+        $callback_url = str_replace('{{activityId}}', $this->params['activityId'], $callback_url);
+        $callback_url .= '&' . $this->params['attr'];
+
+        return app('xuanchen.washcar')->base()
+                                      ->setParams([
+                                          'phone' => $this->params['phone'],
+                                          'url'   => $callback_url,
+                                      ])
+                                      ->getUnLoginUrl();
+    }
+
+    /**
+     * Notes: 获取优惠券详情H5地址
+     * @Author: 玄尘
+     * @Date  : 2021/6/25 14:16
+     * @return array
+     */
+    public function getCouponInfoUrl()
+    {
+        $data = $this->params;
+
+        $callback_url = $this->config['infoUri'];
+        $callback_url = str_replace('{{ticketCode}}', $this->params['code'], $callback_url);
+
+        return app('xuanchen.washcar')->base()
+                                      ->setParams([
+                                          'phone' => $data['phone'],
+                                          'url'   => $callback_url,
+                                      ])
+                                      ->getUnLoginUrl();
+
+    }
+
     /**
      * Notes: 发券
      * @Author: 玄尘
@@ -14,12 +59,14 @@ class CouponAction extends Init
     {
         $url = $this->config['baseUri'] . '/v2/rights/coupon/getCoupon';
 
-        $res = $this->http($url, $this->params);
+        $params = $this->getParams();
-        dd($res);
+        $this->http($url, $params);
+
+        return $this->getResponse();
     }
 
     /**
-     * Notes: 查询
+     * Notes: 查询优惠券状态
      * @Author: 玄尘
      * @Date  : 2021/6/4 14:28
      */
@@ -27,12 +74,31 @@ class CouponAction extends Init
     {
         $url = $this->config['baseUri'] . '/v2/rights/coupon/getCouponStatus';
 
-        $this->http($url, $this->params);
+        $params = $this->getParams();
+
+        $this->http($url, $params);
 
         return $this->getResponse();
 
     }
 
+    /**
+     * Notes: 查询优惠券信息
+     * @Author: 玄尘
+     * @Date  : 2021/6/9 15:22
+     * @return array
+     */
+    public function info()
+    {
+        $url = $this->config['baseUri'] . '/v2/rights/coupon/getCouponInfo';
+
+        $params = $this->getParams();
+
+        $this->http($url, $params);
+
+        return $this->getResponse();
+    }
+
     /**
      * Notes: 取消优惠券
      * @Author: 玄尘
@@ -42,7 +108,78 @@ class CouponAction extends Init
     {
         $url = $this->config['baseUri'] . '/v2/rights/coupon/recedeCoupon';
 
-        $this->http($url, $this->params);
+        $params = $this->getParams();
+
+        $this->http($url, $params);
+
+        return $this->getResponse();
+
+    }
+
+    /**
+     * Notes: 回调地址
+     * @Author: 玄尘
+     * @Date  : 2021/6/29 11:26
+     */
+    public function callback()
+    {
+        $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) {
+
+            if (in_array($coupon->status, [Coupon::STATUS_INIT, Coupon::STATUS_ERROR])) {
+                $coupon->status  = Coupon::STATUS_USED;
+                $coupon->used_at = $verifyTime;
+                $coupon->source  = $this->params;
+                $coupon->save();
+
+                CouponLog::create([
+                    'code'   => $coupon->code,
+                    'from'   => 'Washcar',
+                    'type'   => 'callback',
+                    'remark' => '核销成功',
+                ]);
+
+                //设置订单完成
+                if ($coupon->order && $coupon->order->canComplete()) {
+                    $coupon->order->complete();
+                }
+            }
+
+            $this->error   = 0;
+            $this->message = '操作成功';
+
+        } else {
+            $this->error   = 99;
+            $this->message = '优惠券码不存在';
+        }
+
+        $this->updateLog(['code' => $this->error, 'message' => $this->message]);
 
         return $this->getResponse();
 

src/Action/Init.php

@@ -5,6 +5,7 @@ namespace XuanChen\WashCar\Action;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Support\Facades\Cache;
+use XuanChen\WashCar\Models\WashcarLog;
 
 class Init
 {
@@ -39,6 +40,18 @@ class Init
      */
     protected $message;
 
+    /**
+     * @var 返回的数据
+     */
+    protected $data;
+
+    /**
+     * @var 日志
+     */
+    protected $log;
+
+    protected $url;
+
     public function __construct()
     {
         $this->this_type = config('washcar.this_type');
@@ -51,18 +64,15 @@ class Init
      */
     public function getToken()
     {
-        $this_type = $this->config['this_type'];
-
         //从缓存里找token
-        $token = Cache::get('token_' . $this_type);
+        $access_token = Cache::get('token_' . $this->config['grant_type']);
-
+        if ($access_token) {
-        if ($token) {
+            $this->access_token = $access_token;
-            $token              = collect($token);
-            $this->access_token = $token->access_token;
-
         } else {
             $this->getAjaxToken();
         }
+
+        return $this->access_token;
     }
 
     /**
@@ -75,20 +85,31 @@ class Init
             'client_id'     => $this->config['client_id'],
             'grant_type'    => $this->config['grant_type'],
             'client_secret' => $this->config['client_secret'],
+            'scope'         => 'all',
         ];
 
-        $tokenUrl = $this->config['tokenUri'];
+        $tokenUrl = $this->config['tokenUri'] . '?' . http_build_query($params);
 
         try {
-            $this->http($tokenUrl, $params, 'POST');
+
+            $client = new Client();
+
+            $response = $client->request('GET', $tokenUrl);
+
+            $body    = $response->getBody();
+            $content = $body->getContents();
+            $result  = json_decode($content, true);
 
             if ($this->error > 0) {
                 return new \Exception($this->message);
             }
 
-            Cache::put('token_' . $this->grant_type, $this->data['expires_in']);
+            $this->data = $result['data'];
 
-            $this->access_token = $data['access_token'];
+            Cache::put('token_' . $this->config['grant_type'], $this->data['access_token'], $this->data['expires_in']);
+
+            $this->access_token = $this->data['access_token'];
+            $this->error        = 0;
 
         } catch (RequestException $e) {
             $this->error   = 9999;
@@ -191,13 +212,16 @@ class Init
             throw new \Exception('获取校验数据失败，缺少数据.');
         }
 
-        if (isset($params['sign'])) {
-            unset($params['sign']);
-        }
-
         ksort($params);
 
-        return http_build_query($params) . $this->config['client_secret'];
+        $str = '';
+        foreach ($params as $key => $param) {
+            if ($param != '' || $param != null || $key != 'sign') {
+                $str .= $key . $param;
+            }
+        }
+
+        return $str . $this->config['client_secret'];
     }
 
     /**
@@ -210,13 +234,28 @@ class Init
      */
     public function http($url, $query, $method = 'POST')
     {
+        $this->getToken();
+
+        if (!$this->access_token) {
+            $this->error   = 9999;
+            $this->message = '缺少 access_token';
+
+            return;
+        }
+
+        $this->url = $url . '?access_token=' . $this->access_token;
+
         try {
+
+            $this->addLog($query);
+
             $headers = [
                 'Content-Type' => 'application/json',
             ];
 
-            $client   = new Client();
+            $client = new Client();
-            $response = $client->request($method, $url, [
+
+            $response = $client->request($method, $this->url, [
                 'json'    => $query,
                 'headers' => $headers,
             ]);
@@ -225,21 +264,53 @@ class Init
             $content = $body->getContents();
             $result  = json_decode($content, true);
 
-            if ($result['ret'] > 0) {
+            $this->updateLog($result);
-                $this->error   = $result['ret'];
+
+            if ($result['code'] > 0) {
+                $this->error   = $result['code'];
                 $this->message = $result['message'];
 
                 return false;
             } else {
-                $retData    = $result['data'];
+                $this->data = $result['data'];
-                $this->data = $retData;
+
+                return true;
             }
 
         } catch (RequestException $e) {
-            return ['ret' => '99999', $e->getMessage()];
+            $this->error   = 9999;
+            $this->message = $e->getMessage();
+            $this->updateLog($e->getMessage());
+
         }
     }
 
+    /**
+     * Notes: 插入日志
+     * @Author: 玄尘
+     * @Date  : 2021/6/9 16:36
+     */
+    public function addLog($query)
+    {
+        $this->log = WashcarLog::create([
+            'url'       => $this->url,
+            'in_source' => $query,
+        ]);
+    }
+
+    /**
+     * Notes: 更新log
+     * @Author: 玄尘
+     * @Date  : 2021/6/9 16:40
+     * @param $data
+     */
+    public function updateLog($data)
+    {
+        $this->log->out_source = $data;
+        $this->log->status     = $this->error == 0 ? WashcarLog::STATUS_SUCCESS : WashcarLog::STATUS_ERROR;
+        $this->log->save();
+    }
+
     /**
      * Notes: 返回
      * @Author: 玄尘
@@ -247,10 +318,19 @@ class Init
      */
     public function getResponse()
     {
+        $rt = microtime(true) - LARAVEL_START;
+
+        $header = [
+            'rt'        => round($rt * 1000, 2) . 'ms',
+            'qps'       => round(1 / $rt, 1),
+            'endMemory' => round(memory_get_usage() / 1024 / 1024, 2),
+        ];
+
         return [
             'error'   => $this->error,
             'message' => $this->message,
             'data'    => $this->data,
+            'header'  => $header,
         ];
     }
 

src/Action/UrlAction.php

@@ -14,10 +14,12 @@ class UrlAction extends Init
     {
         $url = $this->config['baseUri'] . '/v2/h5/redirect/autoLogin/returnUrl';
 
-        $params = array_merge($this->params, [
+        $this->params = array_merge($this->params, [
             'urlKey' => $this->config['urlKey'],
         ]);
 
+        $params = $this->getParams();
+
         $this->http($url, $params);
 
         return $this->getResponse();

src/Models/Model.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace XuanChen\WashCar\Models;
+
+use Carbon\Carbon;
+
+class Model extends \Illuminate\Database\Eloquent\Model
+{
+
+    protected $guarded = [];
+
+    protected function serializeDate(\DateTimeInterface $date)
+    {
+        if (version_compare(app()->version(), '7.0.0') < 0) {
+            return parent::serializeDate($date);
+        }
+
+        return $date->format(Carbon::DEFAULT_TO_STRING_FORMAT);
+    }
+
+}

src/Models/WashcarCoupon.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace XuanChen\WashCar\Models;
+
+use Carbon\Carbon;
+use XuanChen\WoUnicom\Action\Order;
+
+class WashcarCoupon extends Model
+{
+
+    protected $casts = [
+        'in_source'  => 'json',
+        'out_source' => 'json',
+    ];
+
+    const STATUS_INIT    = 1;
+    const STATUS_SUCCESS = 2;
+    const STATUS_ERROR   = 3;
+
+    const STATUS = [
+        self::STATUS_INIT    => '初始',
+        self::STATUS_SUCCESS => '成功',
+        self::STATUS_ERROR   => '失败',
+    ];
+
+    public function order()
+    {
+        return $this->morphTo();
+    }
+
+}

src/Models/WashcarLog.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace XuanChen\WashCar\Models;
+
+use Carbon\Carbon;
+
+class WashcarLog extends Model
+{
+
+    protected $casts = [
+        'in_source'  => 'json',
+        'out_source' => 'json',
+    ];
+
+    const STATUS_INIT    = 1;
+    const STATUS_SUCCESS = 2;
+    const STATUS_ERROR   = 3;
+
+    const STATUS = [
+        self::STATUS_INIT    => '初始',
+        self::STATUS_SUCCESS => '成功',
+        self::STATUS_ERROR   => '失败',
+    ];
+
+}

src/ServiceProvider.php

@@ -14,7 +14,9 @@ class ServiceProvider extends LaravelServiceProvider
     public function register()
     {
         if ($this->app->runningInConsole()) {
-            $this->publishes([__DIR__ . '/../config/config.php' => config_path('pingan.php')]);
+            $this->publishes([__DIR__ . '/../config/config.php' => config_path('washcar.php')]);
+            $this->loadMigrationsFrom(__DIR__ . '/../database/migrations/');
+
         }
 
         $this->app->bind('xuanchen.washcar', function ($app) {
@@ -28,7 +30,7 @@ class ServiceProvider extends LaravelServiceProvider
      */
     public function boot()
     {
-        $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'pingan');
+        $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'washcar');
     }
 
 }

src/WashCar.php

@@ -3,6 +3,7 @@
 namespace XuanChen\WashCar;
 
 use XuanChen\WashCar\Action\BaseAction;
+use XuanChen\WashCar\Action\CouponAction;
 use XuanChen\WashCar\Action\UrlAction;
 
 class WashCar
@@ -36,7 +37,7 @@ class WashCar
      */
     public function coupon()
     {
-        return new Coupon
+        return new CouponAction();
     }
 
 }