解决冲突

UPGRADE_2.x.md

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

src/Album/Lib/AlbumInterface.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\Album\Lib;
+use Swoft\Core\ResultInterface;
+
+/**
+ * album servcie
+ * @method ResultInterface deferGetAlbumNumByCmid(int $storeId,int $cmId)
+ */
+
+interface AlbumInterface
+{
+    /**
+     * 查询店员相册个数
+     *
+     * @param integer $storeId
+     * @param integer $cmId
+     * @return int
+     */
+    public function getAlbumNumByCmid(int $storeId,int $cmId);
+}
\ No newline at end of file

src/Common/Pool/Config/AlbumPoolConfig.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\Common\Pool\Config;
+
+use Swoft\Bean\Annotation\Bean;
+use Swoft\Pool\PoolProperties;
+
+/**
+ * the config of service album
+ *
+ * @Bean()
+ */
+class AlbumPoolConfig extends PoolProperties
+{
+
+    public function __construct()
+    {
+        $this->uri=explode(',',env('RPC_ALBUM_URI','album:8099'));
+    }
+    protected $name = 'album';
+
+    /**
+     * Minimum active number of connections
+     *
+     * @var int
+     */
+    protected $minActive = 5;
+
+    /**
+     * the maximum number of active connections
+     *
+     * @var int
+     */
+    protected $maxActive = 300;
+
+    /**
+     * the maximum number of wait connections
+     *
+     * @var int
+     */
+    protected $maxWait = 400;
+
+    /**
+     * Maximum waiting time
+     *
+     * @var int
+     */
+    protected $maxWaitTime = 3;
+
+    /**
+     * Maximum idle time
+     *
+     * @var int
+     */
+    protected $maxIdleTime = 60;
+
+    /**
+     * the time of connect timeout
+     *
+     * @var int
+     */
+    protected $timeout = 200;
+
+    /**
+     * the addresses of connection
+     *
+     * <pre>
+     * [
+     *  '127.0.0.1:88',
+     *  '127.0.0.1:88'
+     * ]
+     * </pre>
+     *
+     * @var array
+     */
+    protected $uri = [];
+
+    /**
+     * whether to user provider(consul/etcd/zookeeper)
+     *
+     * @var bool
+     */
+    protected $useProvider = false;
+
+    /**
+     * the default balancer is random balancer
+     *
+     * @var string
+     */
+    protected $balancer = '';
+
+    /**
+     * the default provider is consul provider
+     *
+     * @var string
+     */
+    protected $provider = '';
+}

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

src/Order/Enum/OrderEnum.php

@@ -28,9 +28,10 @@ class OrderEnum
     const TYPE_GOODS = 0; //商品订单
     const TYPE_CUT_PRICE = 1; //砍价订单
     const TYPE_LIMIT = 2; //限时购订单
-    const TYPE_COLLECTION = 3; //拼团
-    const TYPE_CARD = 4; //储值卡购买订单
-    const TYPE_TIMESCARD = 5; //次卡
+    const TYPE_COLLECTION = 3; //拼团订单
+    const TYPE_CARD = 4; //储值卡订单
+    const TYPE_TIMESCARD = 5; //次卡订单
+    const TYPE_DEPOSIT = 6;//定金订单