wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/SignController.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers\Api\v1;
+
+use App\Http\Controllers\Api\BaseController;
+use App\Services\AdService;
+use App\Services\CityService;
+use App\Services\ConfigService;
+use App\Services\GongdengOrderService;
+use App\Services\OrdersService;
+use App\Services\RechargeService;
+use App\Services\RedisService;
+use App\Services\SignCatesService;
+use App\Services\SignsService;
+use App\Services\WechatService;
+
+/**
+ * 法师/义工打卡签到控制器类
+ * @author wesmiler
+ * @since 2020/11/10
+ * Class SignController
+ * @package App\Http\Controllers
+ */
+class SignController extends BaseController
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * SignController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->service = new SignsService();
+        $this->cateService = new SignCatesService();
+    }
+
+    /**
+     * 打卡签到类型
+     * @return mixed
+     */
+    public function options(){
+        return $this->cateService->getOptions();
+    }
+
+    /**
+     * 打卡签到提交
+     */
+    public function submit(){
+
+    }
+}

app/Http/Controllers/IndexController.php

@@ -104,13 +104,13 @@ class IndexController extends Backend
      * 二维码
      *
      */
-    public function qrcode(){ 
+    public function qrcode(){
         // 二维码
         $url = env('WEB_URL') . '/pages/my/sign?type=1';
-        $qrcode = WechatService::makeNormalQrcode($url);
+        $qrcode = WechatService::makeNormalQrcode($url,false,2);
         $info['master'] = $qrcode ? get_image_url($qrcode) : '';
         $url = env('WEB_URL') . '/pages/my/sign?type=2';
-        $qrcode = WechatService::makeNormalQrcode($url);
+        $qrcode = WechatService::makeNormalQrcode($url,false,2);
         $info['yigong'] = $qrcode ? get_image_url($qrcode) : '';
         return message(MESSAGE_OK,true, $info);
     }

app/Services/WechatService.php

@@ -1432,14 +1432,14 @@ class WechatService extends BaseService
      * @param bool $refresh 是否重新生成
      * @return bool
      */
-    public static function makeNormalQrcode($str, $refresh = false, $logo='', $size = 3, $margin=0, $level=1)
+    public static function makeNormalQrcode($str, $refresh = false, $size = 3, $margin=0, $level=1)
     {
         $qrFile = '/img/qrcode/';
         if (!is_dir('/uploads'.$qrFile)) {
             @mkdir('./uploads' . $qrFile, 0755, true);
         }
 
-        $qrFile = $qrFile . 'U_' . strtoupper(md5($str . '_' . $size.$logo.$margin.$level)) . '.png';
+        $qrFile = $qrFile . 'U_' . strtoupper(md5($str . '_' . $size.$margin.$level)) . '.png';
         $cacheKey = "caches:qrcodes:member_".md5($str);
         if(RedisService::get($cacheKey) && is_file('/uploads'.$qrFile) && !$refresh){
             return $qrFile;

routes/api.php

@@ -188,7 +188,10 @@ Route::post('/advices/list', [\App\Http\Controllers\Api\v1\AdviceController::cla
 Route::post('/advices/info', [\App\Http\Controllers\Api\v1\AdviceController::class, 'info']);
 Route::post('/advices/send', [\App\Http\Controllers\Api\v1\AdviceController::class, 'send']);
 
-
+// 非用户打卡签到
+Route::post('/signs/list', [\App\Http\Controllers\Api\v1\SignController::class, 'index']);
+Route::post('/signs/options', [\App\Http\Controllers\Api\v1\SignController::class, 'options']);
+Route::post('/signs/submit', [\App\Http\Controllers\Api\v1\SignController::class, 'submit']);