调整接口

无意义
2020-11-04 14:42:27 +08:00 · 2020-10-30 16:35:21 +08:00
10 changed files with 2269 additions and 1733 deletions
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-核销系统 增加发券  开发分支
-
--- a/README.md
+++ b/README.md
@@ -0,0 +1,9 @@
+# 核销接口
+
+[TOC]
+
+## 文档说明
+
+| 版本号 | 发行说明           |
+| ------ | ------------------ |
+| 1.0.1  | 第一版本发布       |
--- a/app/Api/Controllers/IndexController.php
+++ b/app/Api/Controllers/IndexController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Api\Controllers;
+
+class IndexController extends Controller
+{
+
+    public function index()
+    {
+        return $this->respond('200', [
+            'code'    => 200,
+            'message' => 'Json Api is ready',
+        ]);
+    }
+
+}
--- a/app/Api/routes.php
+++ b/app/Api/routes.php
@@ -1,6 +1,8 @@
 <?php

 Route::group(['prefix' => 'V1'], function () {
+    Route::get('/', 'IndexController@index');
+
    Route::post('user/get', 'UserController@index');
    Route::post('user/check', 'UserController@check');

@@ -22,5 +24,4 @@ Route::group(['prefix' => 'V1'], function () {
    Route::post('unionpay/index', 'UnionPayController@index');
    Route::post('unionpay/query', 'UnionPayController@query');

-
 });
--- a/app/Http/Controllers/TestController.php
+++ b/app/Http/Controllers/TestController.php
@@ -17,20 +17,36 @@ class TestController

    public function index(Request $request)
    {
-        $user_id = $request->user_id;
-        $data = $request->data;
+        $this->user = User::find(6);
+        $ret        = [
+            'redemptionCode' => 'YSD201029312435',
+            'outletId'       => '2008030929274',
+        ];
+
+        $ret = [
+            'mobile'     => '15663876870',
+            'orderid'    => '202008105236478',
+            'activityId' => 'ysd202010272',
+            'outletId'   => '2008241014458',
+
+        ];
+
+        return $this->success($ret);
+        dd();
+        $user_id    = $request->user_id;
+        $data       = $request->data;
        $this->user = User::find(3);

        $data = '5VehIrHTZsS1BY8V5VcKlhTN9hbutq4j+HIT2zRCbSqgPWvClQSxYSP7mn7PmHuiYQpj55NRC6w4397FfdVTq23wd4BOQ964giie/JForTjt0l7UaY23XzKnNjDSKiGqr7DAbd8P3SzJ75ZjKaqUu7UWu3PVylAeesGRbZgpQEF/XKwOW4XMaJGV2tIsowILZCtF+moqHg7yA6hI4vT7iYU3rTq9vk7kpcnfArLKPQ5dxH9FFIegdr7E1S8NVwpTZrxeQEmjDUsGrBcWe/Q9dRWXSlKF1Hdz2qCUCK94fu3gqvEVSYRllTCa5mwQhlYJLs2UTmWMSism7nsivySseSl1/JOvNH0lyvWaV1XDUMKG8oTC+kOPQKxFA3qp2xO9ohRhN0dkpML4JVgkMF1r6rv+rThYQuOL/rnsuY5Jdh4QdPWCItQ05lqI46s2yPyKROrLx7jQ3/+BOyEmP+Cj5W8/trEAVS1HczMj4Jnl3vrcY879ubokUcEatalAuKGM0uLNAqQF5XfHzgXam4coEMek8MjdbxW+Z9+eZFQp/P1ts7yN5qzpac6Y8CrqSMFJZf1vwowp+1peiEC5tCsXlHCsDLPS8Uh1LNnC3sag0XZu7jX5uVR9nxR2c/ibBJOAHcUO+NcjmzoN+dQOeBkb/aWj9B+9mW5RUQmfUk6O+Vwkb5ruZZbXsoJJULj4tHJv87+mVo30e0mBbaPD47+fTp1+qSJtLOOlLO2nEj1NNDBSBGLM4RxTDQ4ju2r6HY9YyMXsbNC2YB8zrXrDsUoB1WSuu5XcaWx8rzA0NpckzNbEIuv0+6fA69gXOhC9xcGGPyEBbko73XHr7W8MIDtWhGOG8kHf1cAMdjwVGS2OUJ6XKZnBMwIzY8cJn4Fi+jXRMFnt+7BxWLToNQsyOoHbYWypeM8FrAb4VQeaxGhBQUXUmHhmAp00jcGEe/ngxn1oVjq6G+pEq8CxBntvQ+GZ975sPaCqkYOjbuHa9Myd2tT6GWbczL/YcR4RRV96ByYYCEOBy01LsBNeo6SSpWYcK4eoLhc70v8s';
-        $iv = substr($this->user->des3key, 0, 8);
-        $ret = openssl_decrypt($data, 'DES-EDE3-CBC', $this->user->des3key, 0, $iv);
+        $iv   = substr($this->user->des3key, 0, 8);
+        $ret  = openssl_decrypt($data, 'DES-EDE3-CBC', $this->user->des3key, 0, $iv);
        if (false === $ret) {
            return openssl_error_string();
        }
        dd($ret);
        dd();
        $this->user = User::find(215);
-        $ret = [
+        $ret        = [
            'redemptionCode' => '951951858070',
            'total'          => 5,
            'outletId'       => '2006151433887',
@@ -74,7 +90,7 @@ class TestController
     */
    public function grant(Request $request)
    {
-        $this->user = User::find(3);
+        $this->user = User::find(299);

        $data = $this->jiami($request->all());

@@ -95,7 +111,7 @@ class TestController
        $this->user = User::find(3);

        $redemptionCode = $request->redemptionCode;
-        $outletId = $request->outletId;
+        $outletId       = $request->outletId;

        $data = $this->jiami($request->all());

@@ -121,7 +137,7 @@ class TestController
        $this->user = User::find(3);

        $redemptionCode = $request->redemptionCode;
-        $data = $this->jiami($request->all());
+        $data           = $this->jiami($request->all());

        $url = $this->baseUrl . 'user/destroy';
        $res = $this->http($data, $url);
@@ -148,11 +164,11 @@ class TestController
        $this->user = User::find($user_id);

        $data = $this->jiami([
-                                 'redemptionCode' => $request->redemptionCode,
-                                 'total'          => $request->total,
-                                 'outletId'       => $request->outletId,
-                                 'orderid'        => $request->orderid,
-                             ]);
+            'redemptionCode' => $request->redemptionCode,
+            'total'          => $request->total,
+            'outletId'       => $request->outletId,
+            'orderid'        => $request->orderid,
+        ]);

        $url = $this->baseUrl . 'user/freezecoupon';
        $res = $this->http($data, $url);
@@ -160,10 +176,10 @@ class TestController
        return $res;

        $redemptionCode = $request->redemptionCode;
-        $total = $request->total;
-        $outletId = $request->outletId;
-        $orderid = $request->orderid ?? '';
-        $res = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);
+        $total          = $request->total;
+        $outletId       = $request->outletId;
+        $orderid        = $request->orderid ?? '';
+        $res            = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);

        if (is_string($res)) {
            return $this->error($res);
@@ -174,22 +190,22 @@ class TestController

    public function http($data, $url)
    {
-        $client = new Client();
+        $client   = new Client();
        $response = $client->request('POST', $url, ['form_params' => $data, 'http_errors' => false]);

-        $body = $response->getBody();
+        $body    = $response->getBody();
        $content = $body->getContents();
-        $result = json_decode($content, true);
+        $result  = json_decode($content, true);

        return $result;
    }

    public function jiami($ret)
    {
-        $jsonData = json_encode($ret); //数据JSON化
-        $ascdata = $this->keyasc($jsonData); //加密
-        $addcode = sprintf("%08d", mt_rand(0, 99999999)); //随机code 验证签名用
-        $sign = $this->keysign($ascdata, $addcode);
+        $jsonData = json_encode($ret);                     //数据JSON化
+        $ascdata  = $this->keyasc($jsonData);              //加密
+        $addcode  = sprintf("%08d", mt_rand(0, 99999999)); //随机code 验证签名用
+        $sign     = $this->keysign($ascdata, $addcode);

        $data = [
            'server_id' => $this->user->server_id,
@@ -209,7 +225,7 @@ class TestController
     */
    public function jiemi($value)
    {
-        $iv = substr($this->user->des3key, 0, 8);
+        $iv  = substr($this->user->des3key, 0, 8);
        $ret = openssl_decrypt($value, 'DES - EDE3 - CBC', $this->user->des3key, 0, $iv);
        if (false === $ret) {
            return openssl_error_string();
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -101,7 +101,7 @@ class Activity extends Model

        try {
            //            $code = 'YSD' . date('ymd') . mt_rand(100000, 999999);
-            $code = '66406' . date('ymd') . mt_rand(100000, 999999);
+            $code = '66406' . date('ymdH') . mt_rand(1000000, 9999999);
            if ($this->type == SELF::TYPE_EXTEND) {
                $start_at = now();
                $end_at   = now()->addDays($this->days);
--- a/bootstrap/cache/packages.php
+++ b/bootstrap/cache/packages.php
@@ -1,13 +1,13 @@
 <?php return array (
-  'aslong/sms' => 
+  'barryvdh/laravel-debugbar' => 
  array (
    'providers' => 
    array (
-      0 => 'AsLong\\Sms\\ServiceProvider',
+      0 => 'Barryvdh\\Debugbar\\ServiceProvider',
    ),
    'aliases' => 
    array (
-      'Sms' => 'AsLong\\Sms\\Facades\\Sms',
+      'Debugbar' => 'Barryvdh\\Debugbar\\Facade',
    ),
  ),
  'encore/laravel-admin' => 
@@ -21,17 +21,6 @@
      'Admin' => 'Encore\\Admin\\Facades\\Admin',
    ),
  ),
-  'facade/ignition' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'Flare' => 'Facade\\Ignition\\Facades\\Flare',
-    ),
-  ),
  'fideloper/proxy' => 
  array (
    'providers' => 
@@ -82,24 +71,6 @@
      0 => 'Carbon\\Laravel\\ServiceProvider',
    ),
  ),
-  'nunomaduro/collision' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    ),
-  ),
-  'overtrue/laravel-wechat' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'EasyWeChat' => 'Overtrue\\LaravelWeChat\\Facade',
-    ),
-  ),
  'simplesoftwareio/simple-qrcode' => 
  array (
    'providers' => 
--- a/bootstrap/cache/services.php
+++ b/bootstrap/cache/services.php
@@ -23,24 +23,21 @@
    19 => 'Illuminate\\Translation\\TranslationServiceProvider',
    20 => 'Illuminate\\Validation\\ValidationServiceProvider',
    21 => 'Illuminate\\View\\ViewServiceProvider',
-    22 => 'AsLong\\Sms\\ServiceProvider',
+    22 => 'Barryvdh\\Debugbar\\ServiceProvider',
    23 => 'Encore\\Admin\\AdminServiceProvider',
-    24 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    26 => 'Intervention\\Image\\ImageServiceProvider',
-    27 => 'Encore\\WangEditor\\WangEditorServiceProvider',
-    28 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    29 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    30 => 'Carbon\\Laravel\\ServiceProvider',
-    31 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    32 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
-    33 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
-    34 => 'App\\Providers\\AppServiceProvider',
-    35 => 'App\\Providers\\AuthServiceProvider',
-    36 => 'App\\Providers\\EventServiceProvider',
-    37 => 'App\\Providers\\RouteServiceProvider',
-    38 => 'App\\Api\\ApiServiceProvider',
-    39 => 'App\\Merchant\\MerchantServiceProvider',
+    24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    25 => 'Intervention\\Image\\ImageServiceProvider',
+    26 => 'Encore\\WangEditor\\WangEditorServiceProvider',
+    27 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    28 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    29 => 'Carbon\\Laravel\\ServiceProvider',
+    30 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
+    31 => 'App\\Providers\\AppServiceProvider',
+    32 => 'App\\Providers\\AuthServiceProvider',
+    33 => 'App\\Providers\\EventServiceProvider',
+    34 => 'App\\Providers\\RouteServiceProvider',
+    35 => 'App\\Api\\ApiServiceProvider',
+    36 => 'App\\Merchant\\MerchantServiceProvider',
  ),
  'eager' => 
  array (
@@ -54,24 +51,21 @@
    7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
    8 => 'Illuminate\\Session\\SessionServiceProvider',
    9 => 'Illuminate\\View\\ViewServiceProvider',
-    10 => 'AsLong\\Sms\\ServiceProvider',
+    10 => 'Barryvdh\\Debugbar\\ServiceProvider',
    11 => 'Encore\\Admin\\AdminServiceProvider',
-    12 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    13 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    14 => 'Intervention\\Image\\ImageServiceProvider',
-    15 => 'Encore\\WangEditor\\WangEditorServiceProvider',
-    16 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    18 => 'Carbon\\Laravel\\ServiceProvider',
-    19 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    20 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
-    21 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
-    22 => 'App\\Providers\\AppServiceProvider',
-    23 => 'App\\Providers\\AuthServiceProvider',
-    24 => 'App\\Providers\\EventServiceProvider',
-    25 => 'App\\Providers\\RouteServiceProvider',
-    26 => 'App\\Api\\ApiServiceProvider',
-    27 => 'App\\Merchant\\MerchantServiceProvider',
+    12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    13 => 'Intervention\\Image\\ImageServiceProvider',
+    14 => 'Encore\\WangEditor\\WangEditorServiceProvider',
+    15 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    16 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    17 => 'Carbon\\Laravel\\ServiceProvider',
+    18 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
+    19 => 'App\\Providers\\AppServiceProvider',
+    20 => 'App\\Providers\\AuthServiceProvider',
+    21 => 'App\\Providers\\EventServiceProvider',
+    22 => 'App\\Providers\\RouteServiceProvider',
+    23 => 'App\\Api\\ApiServiceProvider',
+    24 => 'App\\Merchant\\MerchantServiceProvider',
  ),
  'deferred' => 
  array (
--- a/composer.lock
+++ b/composer.lock
--- a/packages/sinopec/src/Sinopec.php
+++ b/packages/sinopec/src/Sinopec.php
@@ -2,143 +2,10 @@

 namespace XuanChen\Sinopec;

-use App\Models\Activity;
-use App\Models\User;
-use Illuminate\Support\Facades\DB;
-
 /**
 * 中石化接口
 */
 class Sinopec
 {

-    /**
-     * Notes: 发券接口
-     * @Author: 玄尘
-     * @Date  : 2020/6/28 15:07
-     * @param $activityId  活动编号
-     * @param $outletId    网点编号
-     * @param $mobile      手机号
-     */
-    public static function Grant($activityId, $outletId, $mobile)
-    {
-        $model = config('xuanchen_coupon.rules.ysd.model');
-
-        return (new $model)->setActivityId($activityId)
-                           ->setOutletId($outletId)
-                           ->setMobile($mobile)
-                           ->grant();
-
-    }
-
-    /**
-     * Notes: 查询接口
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 11:58
-     * @param $redemptionCode
-     */
-    public static function Query($redemptionCode, $outletId)
-    {
-        if (!$redemptionCode) {
-            return '查询失败，未获取到券码';
-        }
-
-        $model = self::getModelByCode($redemptionCode);
-        if (is_string($model)) {
-            return $model;
-        }
-
-        return $model->setCode($redemptionCode)
-                     ->setOutletId($outletId)
-                     ->detail();
-    }
-
-    /**
-     * Notes: 卡券作废
-     * @Author: 玄尘
-     * @Date  : 2020/9/2 16:54
-     * @param $redemptionCode
-     * @param $outletId
-     * @return string
-     */
-    public static function Destroy($redemptionCode, $outletId)
-    {
-        try {
-            $model = self::getModelByCode($redemptionCode);
-            if (is_string($model)) {
-                return $model;
-            }
-
-            return $model->setCode($redemptionCode)
-                         ->setOutletId($outletId)
-                         ->destroy();
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
-    /**
-     * Notes: 根据券码 获取class
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 12:00
-     * @param $code
-     * @return string
-     */
-    public static function getModelByCode($code)
-    {
-        $rules = config('xuanchen_coupon.rules');
-        if (!$rules) {
-            return '系统出错，未找到配置文件';
-        }
-
-        $model = '';
-        foreach ($rules as $rule) {
-            if (preg_match($rule['pattern'], $code, $matches)) {
-                $model = $rule['model'];
-                break;
-            }
-        }
-
-        if (!$model) {
-            throw new \Exception('卡券核销失败。未查到卡券所属');
-        }
-
-        return new $model;
-
-    }
-
-    /**
-     * Notes: description
-     * @Author: 玄尘
-     * @Date  : 2020/8/21 13:33
-     * @param \App\Models\User $user           渠道
-     * @param string           $redemptionCode 要核销的券码
-     * @param float            $total          订单金额
-     * @param string           $outletId       网点id
-     * @param string           $orderid        订单id
-     * @return string
-     */
-    public static function Redemption(User $user, string $redemptionCode, float $total, string $outletId, string $orderid = '')
-    {
-
-        try {
-            $model = self::getModelByCode($redemptionCode);
-            if (is_string($model)) {
-                return $model;
-            }
-
-            return $model->setUser($user)
-                         ->setCode($redemptionCode)
-                         ->setTotal($total)
-                         ->setOutletId($outletId)
-                         ->setOrderId($orderid)
-                         ->start();
-
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
 }
Author	SHA1	Message	Date
xuanchen	102b7e1846	调整接口	2020-11-04 14:42:27 +08:00
xuanchen	a8852873d2	无意义	2020-10-30 16:35:21 +08:00