Merge remote-tracking branch 'origin/test' into test

UPGRADE_2.x.md

@@ -17,8 +17,8 @@
 - 配合前端改版后端大调整
 
 # 2.0.11
+- 砍价订单枚举状态加订单删除
 - 关闭拼团活动状态
- 砍价订单枚举状态加订单删除
 
 # 2.0.10
 - 根据商户平台id获取对应的小程序托管配置

src/Common/Entity/User.php

@@ -62,6 +62,11 @@ class User
         return $this->getValue('headImg');
     }
 
+    public function getGender()
+    {
+        return $this->getValue('gender');
+    }
+
     public function getToken()
     {
         return $this->getValue('token');

src/Craftsman/Enum/CmanEnum.php

+<?php
+namespace Hdll\Services\Craftsman\Enum;
+
+class CmanEnum 
+{
+    const SYNC_ITEM_ADD = 1;//新加商品
+    const SYNC_ITEM_DEL = 2;//去除商品
+
+    
+}
\ No newline at end of file

src/Craftsman/Lib/CraftsmanInterface.php

@@ -18,6 +18,7 @@ use Swoft\Core\ResultInterface;
  *
  * @method ResultInterface deferGetCraftsmenList(int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId)
+ * @method ResultInterface defercreateCraftsman($storeId, array $params)
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
@@ -37,6 +38,26 @@ interface CraftsmanInterface
     // wechat     店员微信号
 
     /**
+     * 创建店员
+     *
+     * @param integer $storeId
+     * @param array $params 所需参数
+     *array(
+     * 'name'    => '', // 姓名
+     * 'sex'     => '', // 性别
+     * 'wxNick'  => '', // 昵称
+     * 'headimg' => '', // 头像
+     * 'items'   => '', // 包含的服务项目列表
+     * 'subStores' => '', // 所属门店列表
+     * 'motto'   => '', // 个性签名
+     * 'adept'   => '', // 个人擅长
+     * 'wechat'  => '', // 微信号
+     *)
+     * @return int|bool
+     */
+    public function createCraftsman($storeId, array $params);
+
+    /**
      * 获取店员列表
      *
      * @param integer $storeId

src/FrontMoney/Enum/FrontCmqEnum.php

+<?php
+
+namespace Hdll\Services\FrontMoney\Enum;
+
+class FrontCmqEnum
+{
+
+	const TOPIC = 'frontMoney';
+
+	const UP_ORDER_STATUS = 'upOrderStatus'; //更新订单状态
+}
\ No newline at end of file

src/FrontMoney/Enum/FrontMoneyEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: lwt
+ * Date: 2018/7/10
+ * Time: 13:15
+ */
+namespace Hdll\Services\FrontMoney\Enum;
+
+class FrontMoneyEnum
+{
+
+  
+    //订单状态
+    const STATUS_NORMAL = 10; //待支付
+
+}
\ No newline at end of file

src/FrontMoney/Enum/FrontOrderEnum.php

+<?php
+
+namespace Hdll\Services\FrontMoney\Enum;
+
+class FrontOrderEnum
+{
+
+
+    //订单状态
+    const STATUS_NORMAL = 1; //待支付  1未支付2已经支付3异常 //=未付款
+    const STATUS_HAVE_PAY =2;  // 已经支付  //=已下单
+    const STATUS_PAY_EXCEPTION =3;  // 支付异常或过期未付 //=关闭订单
+    const STATUS_PAY_REFUND =4 ; // 退款   //=已过期
+    const ORDER_DELETED = 5; //订单删除
+
+
+    //------------状态转换-----------------------
+    const NOT_PAY = 3;//未付款
+    const HAVE_PAID_ORDER = 4;//已下单
+    const CLOSED = 7;//关闭订单
+    const OVERDUE =8;//已过期
+
+
+}
\ No newline at end of file

src/FrontMoney/Lib/FrontMoneyInterface.php

+<?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 Hdll\Services\FrontMoney\Lib;
+
+use Hdll\Services\FrontMoney\Enum\FrontOrderEnum;
+use Swoft\Core\ResultInterface;
+
+/**
+ * The interface of demo service
+ *
+ * @method  ResultInterface deferBackNum(string $token, int $consignee_id, int $front_id, int $selected_num, int $order_type, int $goods_id, string $reservation_time = '')
+ * @method ResultInterface deferGetFrontGoods(int $storeId, int $frontId)
+ * @method ResultInterface deferGetFrontInfo(int $storeId, int $goodsId)
+ * @method ResultInterface deferPayStatus(string $store_id,int $front_id, int $status, int $orderId)
+ * @method  ResultInterface deferGetFrontCounts(int $storeId)
+ * @method ResultInterface deferGetNewOrderNum(int $storeId,int $lastTime)
+ */
+interface FrontMoneyInterface
+{
+    /**
+     *
+     * 补回  未支付 定金活动  库存
+     * @param string $token
+     * @param int $consignee_id
+     * @param int $front_id
+     * @param int $selected_num
+     * @param int $order_type
+     * @param int $goods_id
+     * @param string $reservation_time
+     * @return mixed
+     */
+    public function backNum(
+        string $token,
+        int $consignee_id,
+        int $front_id,
+        int $selected_num,
+        int $order_type,
+        int $goods_id,
+        string $reservation_time);
+
+    /**
+     *  获取限时购商品的 商品信息
+     * @param int $front_id
+     * @return {
+     * "name"              名称
+     * "image"             图片
+     * "price"             价格
+     * "activityName"      活动名称
+     * }
+     */
+    public function getFrontGoods(int $storeId, int $frontId);
+
+    /**
+     * 通过商品id  获取是否 有限时购活动
+     * @param int $storeId
+     * @param int $goodsId
+     * @return bool
+     *
+     */
+    public function getFrontInfo(int $storeId, int $goodsId);
+
+
+    /**
+     * 支付 状态 回馈接口
+     * @param string $store_id
+     * @param int $front_id
+     * @param int $status // 2.FrontOrderEnum::STATUS_HAVE_PAY 成功支付  3：FrontOrderEnum::STATUS_PAY_EXCEPTION 未支付 （已经过期或者支付异常）4 FrontOrderEnum::STATUS_PAY_REFUND  退款
+     * @param int $orderId
+     * @return bool|mixed
+     * @throws ConException
+     */
+    public function payStatus(string $store_id,int $front_id,int $status, int $orderId);
+
+    /**
+     * 获取限时购活动总个数 和正在进行的个数
+     *
+     * @return mixed
+     */
+    public function getFrontCounts(int $storeId);
+
+
+    /**
+     *获取自上次时间以来产生的新订单数
+     *
+     * @param [int] $storeId
+     * @param [int] $lastTime
+     * @return int
+     */
+    public function getNewOrderNum(int $storeId,int $lastTime);
+}
\ No newline at end of file