1.买家hasUser接口

2.公共实体优化

src/Buyer/BuyerInterface.php → src/Buyer/Lib/BuyerInterface.php

@@ -5,7 +5,7 @@
  * Date: 2018/7/5
  * Time: 15:47
  */
-namespace Hdll\Services\Buyer;
+namespace Hdll\Services\Buyer\Lib;
 
 use Swoft\Core\ResultInterface;
 
@@ -21,4 +21,5 @@ interface BuyerInterface
 
     public function updateProfile(string $token, array $data);
 
+    public function hasUser($storeId,$unionid);
 }
\ No newline at end of file

src/Common/Entity/CommonEntity.php

@@ -59,14 +59,12 @@ class CommonEntity extends Model
      */
     protected function split()
     {
-        $request = RequestContext::getRequest();
-        if (  empty($request) ) {//初始化不做处理
+        if (  empty(RequestContext::getContextData()) ) {//初始化不做处理
             return;
         }
 
-        $testFlag =  $request->query('flag');
 
-        if ( false === strpos(self::$commentString,"{split}") || $testFlag == 'hdllTest' ) {
+        if ( false === strpos(self::$commentString,"{split}") || App::$isInTest ) {
             return;
         }
 
@@ -86,18 +84,19 @@ class CommonEntity extends Model
      */
     public static function tableName()
     {
-        $request = RequestContext::getRequest();
-        if (  empty($request) ) {//初始化不做处理
+
+        if (  empty(RequestContext::getContextData()) ) {//初始化不做处理
             return;
         }
 
+        $request = RequestContext::getRequest();
         $testFlag =  $request->query('flag');
 
         //获取注解里的table
         $res = new \ReflectionClass(static::class);
         self::$commentString = $res->getDocComment();
 
-        if ( false !== strpos(self::$commentString,"{split}") && $testFlag != 'hdllTest') {
+        if ( false !== strpos(self::$commentString,"{split}") &&  App::$isInTest) {
             $dbNum = self::getDbNum();
             $tableName = self::getTableName().'_'.$dbNum;
             self::setTableName($tableName);