Merge branch 'master' of http://139.199.22.180/tencent/services

src/Buyer/Lib/FootprintInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/30
+ * Time: 9:50
+ */
+namespace Hdll\Services\Buyer\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * @method   ResultInterface deferDelByStoreId(int $storeId)
+ * Interface Footprint
+ * @package Hdll\Services\Buyer\Lib
+ */
+interface FootprintInterface
+{
+    public function delByStoreId(int $storeId) : bool;
+}
\ No newline at end of file

src/Commands/ClassTemplate/Dao/ClassTemplate

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Argericy
+ * Date: 2018/7/23
+ * Time: 15:54
+ */
+namespace App\Models\Dao;
+use App\Models\Entity\{entityName};
+use Swoft\Bean\Annotation\Bean;
+use Hdll\Services\Common\Exception\CommonException;
+
+/**
+ * @Bean()
+ * Class {className}
+ * @package App\Models\Dao
+ */
+class {className}
+{
+
+    public function create(array $info) : {entityName}
+    {
+        ${varEntityName} = new {entityName}($info);
+        $res = ${varEntityName}->save()->getResult();
+        if ( $res === false ) {
+            throw new CommonException(["msg" => "数据库操作错误", "code" => 500]);
+        }
+
+        return ${varEntityName};
+    }
+
+    public function selectInfoByCondition($condition, $field)
+    {
+        return {entityName}::findAll($condition, ['fields' => $field])->getResult();
+    }
+
+    public function getInfoByCondition($condition, $field)
+    {
+        return {entityName}::findOne($condition, ['fields' => $field])->getResult();
+    }
+
+    /**
+     * 根据条件更新信息
+     * @param $condition
+     * @param $updateInfo
+     * @return mixed
+     */
+    public function updateByCondition($condition, $updateInfo)
+    {
+        return {entityName}::updateAll($updateInfo, $condition)->getResult();
+    }
+
+    /**
+     * 更新一条记录
+     *
+     * @param $condition
+     * @param $updateInfo
+     * @return mixed
+     */
+    public function updateOne($condition, $updateInfo)
+    {
+        return {entityName}::updateOne($updateInfo, $condition)->getResult();
+    }
+
+}
\ No newline at end of file

src/Commands/ClassTemplate/Data/ClassTemplate

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Argericy
+ * Date: 2018/9/29
+ * Time: 11:35
+ */
+ namespace App\Models\Data;
+
+use App\Models\Dao\{daoName};
+use Swoft\Bean\Annotation\Bean;
+use Swoft\Bean\Annotation\Inject;
+
+/**
+  * @Bean()
+  *
+  * Class {dataName}
+  * @package App\Models\Data
+  */
+class {dataName}
+{
+    /**
+     * @Inject()
+     * @var {daoName}
+     */
+    private ${varDaoName};
+
+}
\ No newline at end of file

src/Commands/GenerateCommand

+<?php
+/**
+ * This file is part of Swoft.
+ *
+ * @link https://swoft.org
+ * @document https://doc.swoft.org
+ * @contact group@swoft.org
+ * @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
+
+namespace App\Commands\Common;
+
+use Swoft\Console\Bean\Annotation\Command;
+use Swoft\Console\Bean\Annotation\Mapping;
+use Swoft\Console\Input\Input;
+use Swoft\Console\Output\Output;
+
+/**
+ * generate dao,data layer commands
+ *
+ * @Command(coroutine=false)
+ */
+class GenerateCommand
+{
+    /**
+     * this generate command
+     *
+     * @Usage
+     * generate:dao [options]
+     *
+     * @Options
+     * -n,--n the dao name
+     * -e,--e the entity name
+     *
+     * @Example
+     * php swoft generate:dao -e entityName [-n daoName]
+     *
+     * @param Input  $input
+     * @param Output $output
+     *
+     * @Mapping("dao")
+     */
+    public function Dao(Input $input, Output $output)
+    {
+        $className    = $input->getOpt('n');
+        $entityName   = $input->getOpt('e');
+
+        $this->generateDao($output, $className, $entityName);
+    }
+
+    /**
+     * this generate command
+     *
+     * @Usage
+     * generate:all [options]
+     *
+     * @Options
+     * -n,--n the dao name
+     * -e,--e the entity name
+     *
+     * @Example
+     * php swoft generate:dao -e entityName [-n dataName] [--dao-name daoName]
+     *
+     * @param Input  $input
+     * @param Output $output
+     *
+     * @Mapping("all")
+     */
+    public function all(Input $input, Output $output)
+    {
+        $dataName    = $input->getOpt('n');
+        $entityName   = $input->getOpt('e');
+        $daoName   = $input->getOpt('dao-name');
+
+        $appPath = alias('@app');
+        $dataName = empty($dataName)?$entityName.'Data':$dataName;
+
+        //generateDao
+        $daoName = empty($daoName)?$entityName.'Dao':$daoName;
+        $this->generateDao($output, $daoName, $entityName);
+
+        //generateData
+        $dataPath = $appPath.'/Models/Data/'.$dataName.'.php';
+        $templatePath = $appPath.'/Commands/Common/ClassTemplate/Data/ClassTemplate';
+        $content = file_get_contents($templatePath);
+        $content = str_replace('{dataName}', $dataName, $content);
+        $content = str_replace("{daoName}", $daoName, $content);
+        $content = str_replace("{varDaoName}", lcfirst($daoName), $content);
+
+        file_put_contents($dataPath, $content);
+
+
+
+
+
+    }
+
+    private function generateDao($output,$daoName, $entityName)
+    {
+        if ( empty($entityName) ) {
+            $output->writeln("the en option is required", true, true);
+        }
+
+        $daoName = empty($daoName)?$entityName.'Dao':$daoName;
+
+        $daoPath =   alias("@app").'/Models/Dao/'.$daoName.'.php';
+
+        $templatePath = alias("@app").'/Commands/Common/ClassTemplate/Dao/ClassTemplate';
+
+        $content = file_get_contents($templatePath);
+
+        $content = str_replace("{className}", $daoName,$content);
+
+        $content = str_replace("{entityName}", $entityName, $content);
+        $content = str_replace("{varEntityName}", lcfirst($entityName), $content);
+
+        file_put_contents($daoPath,$content);
+
+    }
+}
\ No newline at end of file

src/Notice/Enum/RedisKeyEnum.php

@@ -11,6 +11,6 @@ class RedisKeyEnum
 {
     const PREFIX = "notice:";
 
-    const ORDER_RESERVATION = self::PREFIX."order_reversion_";
+    const ORDER_RESERVATION = self::PREFIX."order_reservation_";
 
 }
\ No newline at end of file

src/Notice/Lib/NoticeInterface.php

@@ -61,7 +61,7 @@ interface NoticeInterface
      *
      * 微信公众号发送实例
     $data[NoticeEnum::TYPE_MP_SEND] = [
-        'touser' => 'o3lFcs8xoWfQUlhzTiP5uZI6A7Hc', //这里要填写公众号的openId
+        'unionId' => 'o3lFcs8xoWfQUlhzTiP5uZI6A7Hc', //填写用户的unionId
         'template_id' => 'zwUBuoKVRJkumLwGkippA46XfmLsmwJD906HC-wqOks',
         'miniprogram' => [
             'appid' => 'wx3b3b2df942634cdd', //小程序appid

src/Seller/Lib/SellerInterface.php

@@ -14,6 +14,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferSave($referId, $unionId, $openId, $nickName, $headImgUrl)
  * @method ResultInterface deferGet($id,$fields=['*'])
  * @method ResultInterface deferGetByUnionId($unionId,$fields=['*'])
+ * @method ResultInterface deferGetByStoreId($storeId,$fields=['*'])
  * @method ResultInterface deferUpdate($id,$data)
  * Interface SellerInterface
  * @package App\Lib
@@ -65,4 +66,12 @@ interface SellerInterface
 	 */
 	public function update($condition,$data);
 
+	/**
+	 * @param       $storeId
+	 * @param array $fields
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function getByStoreId($storeId, $fields = ['*']);
+
 }
\ No newline at end of file

src/Store/Lib/StoreInterface.php

@@ -16,6 +16,7 @@ use Swoft\Core\ResultInterface;
  * The interface of store service
  *
  * @method ResultInterface deferIsCertified(int $storeId)
+ * @method ResultInterface deferIsNormal(int $storeId)
  * @method ResultInterface deferGetStoreByStoreId(int $storeId)
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
@@ -29,11 +30,20 @@ interface StoreInterface
      * 查询店铺是否已实名认证（企业认证）
      *
      * @param integer $storeId
-     * @return boolean
+     * @return bool true:认证成功  false:未认证
      */
     public function isCertified(int $storeId);
 
     /**
+     * 查询店铺是否正常
+     *
+     * @Number(name="storeId")
+     * @param integer $storeId
+     * @return bool true:正常，false:冻结
+     */
+    public function isNormal(int $storeId);
+
+    /**
      * 根据店铺ID获取店铺信息
      *
      * @param integer $storeId