Merge remote-tracking branch 'origin/master'

src/Common/Entity/User.php

@@ -184,6 +184,7 @@ class User
     {
     {
         $userInfo = [];
         $userInfo = [];
         $userInfo['userInfo'][$key] = $value;
         $userInfo['userInfo'][$key] = $value;
+        RequestContext::removeContextDataByChildKey('userInfo', $key);
         RequestContext::setContextData($userInfo);
         RequestContext::setContextData($userInfo);
     }
     }
 
 

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
  * method ResultInterface deferReduceBalance($sellerId, $money)
  * method ResultInterface deferReduceBalance($sellerId, $money)
  * method ResultInterface deferAddTotal($sellerId, $money)
  * method ResultInterface deferAddTotal($sellerId, $money)
  * method ResultInterface deferReduceTotal($sellerId, $money)
  * method ResultInterface deferReduceTotal($sellerId, $money)
- * method ResultInterface deferListByOrderId($storeId, $orderId)
+ * method ResultInterface deferListByOrderId($storeId, $orderId,$sellerId)
  * Interface SellerDistributionInterface
  * Interface SellerDistributionInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -85,8 +85,9 @@ interface SellerDistributionInterface{
 	 * 获取分销记录
 	 * 获取分销记录
 	 * @param $storeId
 	 * @param $storeId
 	 * @param $orderId
 	 * @param $orderId
+	 * @param $sellerId
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
-	public function listByOrderId($storeId, $orderId);
+	public function listByOrderId($storeId, $orderId,$sellerId);
 }
 }
\ No newline at end of file