Browse Source

Merge branch 'coupon_rebate' into develop

# Conflicts:
#	Envoy.blade.php
#	composer.json
#	config/autoload/dependencies.php
#	config/routes.php
master
weigang 6 years ago
parent
commit
2c354269fc
  1. 2
      Envoy.blade.php
  2. 28
      app/Controller/CouponRebateController.php
  3. 28
      app/Controller/ParamsTokenController.php
  4. 11
      app/Service/ParamsTokenServiceInterface.php
  5. 17
      app/Service/ParamsTokenSsdbService.php
  6. 1
      config/autoload/dependencies.php
  7. 4
      config/routes.php

2
Envoy.blade.php

@ -21,7 +21,7 @@
cd /lanzu_api
git pull origin master
@if($composer == true)
composer update --lock
composer update --no-dev --lock
@endif
supervisorctl restart lanzu_api
@endtask

28
app/Controller/CouponRebateController.php

@ -0,0 +1,28 @@
<?php
declare(strict_types=1);
/**
* This file is part of Hyperf.
*
* @link https://www.hyperf.io
* @document https://doc.hyperf.io
* @contact group@hyperf.io
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/
namespace App\Controller;
use App\Model\CouponUserRecType;
use App\Model\Coupon;
use App\Model\CouponRec;
use Hyperf\DbConnection\Db;
use Hyperf\Redis\Redis;
use Hyperf\Utils\ApplicationContext;
class CouponRebateController extends BaseController
{
public function isCouponRebate()
{
return $this->success('创建成功');
}
}

28
app/Controller/ParamsTokenController.php

@ -0,0 +1,28 @@
<?php
namespace App\Controller;
use App\Service\ParamsTokenServiceInterface;
use Hyperf\Di\Annotation\Inject;
class ParamsTokenController extends BaseController
{
/**
* @Inject
* @var ParamsTokenServiceInterface
*/
protected $paramsTokenService;
public function generate()
{
$res = $this->paramsTokenService->generate($this->request->all());
return $this->success($res);
}
public function analyze()
{
$res = $this->paramsTokenService->analyze($this->request->input('token'));
return $this->success($res);
}
}

11
app/Service/ParamsTokenServiceInterface.php

@ -0,0 +1,11 @@
<?php
namespace App\Service;
interface ParamsTokenServiceInterface
{
public function generate($params);
public function analyze($token);
}

17
app/Service/ParamsTokenSsdbService.php

@ -0,0 +1,17 @@
<?php
namespace App\Service;
class ParamsTokenSsdbService implements ParamsTokenServiceInterface
{
public function generate($params)
{
return 'token_123456';
}
public function analyze($token)
{
return ['page' => 'zh_cjdianc/pages/couponrebate/index', 'previous_id' => 211, 'is_expired' => 2];
}
}

1
config/autoload/dependencies.php

@ -12,4 +12,5 @@ declare(strict_types=1);
return [
\App\Service\ServiceEvaluateServiceInterface::class => \App\Service\ServiceEvaluateService::class,
\App\Service\AttachmentServiceInterface::class => \App\Service\AttachmentService::class,
\App\Service\ParamsTokenServiceInterface::class => \App\Service\ParamsTokenSsdbService::class,
];

4
config/routes.php

@ -27,6 +27,6 @@ Router::addGroup('/v1/',function (){
Router::post('Attachment/uploadImage', 'App\Controller\AttachmentController@uploadImage');
Router::post('Attachment/uploadImageByBase64', 'App\Controller\AttachmentController@uploadImageByBase64');
Router::post('Attachment/upload', 'App\Controller\AttachmentController@upload');
Router::POST('ParamsToken/generate', 'App\Controller\ParamsTokenController@generate');
Router::POST('ParamsToken/analyze', 'App\Controller\ParamsTokenController@analyze');
});
Loading…
Cancel
Save