Merge remote-tracking branch 'origin/master'

src/Order/Enum/OrderCate.php

@@ -9,6 +9,8 @@ namespace Hdll\Services\Order\Enum;
 
 
 class OrderCate
 class OrderCate
 {
 {
-    const TYPE_BUYER = 1;
-    const TYPE_SELLER = 2;
+    const TYPE_BUYER = 1;//小程序买家签名类型
+    const TYPE_SELLER = 2; //小程序卖家签名类型
+    const TYPE_MP = 3; //公众号签名类型
+
 }
 }
\ No newline at end of file

src/Pay/Lib/PayInterface.php

@@ -14,6 +14,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGenerateSellerSign(int $storeId, int $orderId, string $openId)
  * @method ResultInterface deferGenerateSellerSign(int $storeId, int $orderId, string $openId)
  * @method ResultInterface deferRePay(int $storeId, int $orderId, int $buyerId)
  * @method ResultInterface deferRePay(int $storeId, int $orderId, int $buyerId)
  * @method ResultInterface deferSellerRePay(int $storeId, int $orderId, int $sellerId)
  * @method ResultInterface deferSellerRePay(int $storeId, int $orderId, int $sellerId)
+ * @method ResultInterface deferMpGenerateSign(int $storeId, int $orderId, int $sellerId)
  *
  *
  * Interface PayInterface
  * Interface PayInterface
  * @package Hdll\Services\Pay\Lib
  * @package Hdll\Services\Pay\Lib
@@ -40,6 +41,18 @@ interface PayInterface
      */
      */
     public function generateSellerSign(int $storeId, int $orderId, string $openId);
     public function generateSellerSign(int $storeId, int $orderId, string $openId);
 
 
+    /**
+     * 公众号生成签名
+     *
+     * @param int $storeId
+     * @param int $orderId
+     * @param string $openId
+     * @return mixed
+     */
+    public function mpGenerateSign(int $storeId, int $orderId, string $openId);
+
+    
+
 
 
     /**
     /**
      * 卖家重新支付生成签名
      * 卖家重新支付生成签名

src/WithdrawCash/Enum/WithdrawCmqEnum.php

@@ -13,4 +13,10 @@ class WithdrawCmqEnum{
 	const ADD_SELLER_FREEZE = 'addSellerFreeze';//增加卖家营收冻结金额
 	const ADD_SELLER_FREEZE = 'addSellerFreeze';//增加卖家营收冻结金额
 
 
 	const REDUCE_SELLER_FREEZE = 'reduceSellerFreeze';//减少卖家营收冻结金额
 	const REDUCE_SELLER_FREEZE = 'reduceSellerFreeze';//减少卖家营收冻结金额
+
+	const CREATE_BUYER_CM_ACCOUNT = 'createBuyrCmAccount';//创建买家分销账户
+
+	const CREATE_SELLER_CM_ACCOUNT = 'createSellerCmAccount';//创建卖家分销账户 
+
+	const CREATE_SELLER_FD_ACCOUNT = 'createSellerFdAccount';//创建卖家营业额账户
 }
 }
\ No newline at end of file