Merge branch 'master' of http://139.199.22.180/tencent/services

src/Common/Entity/Split.php

@@ -45,10 +45,10 @@ class Split
 
 
             } elseif ( isset($map[$tableName]) ) { //非实体且分表
             } elseif ( isset($map[$tableName]) ) { //非实体且分表
                 $className = $map[$tableName];
                 $className = $map[$tableName];
-                $defaultTbleName = $tableName;
+                $defaultTableName = $tableName;
                 $tableName = $tableName.'_'.self::getDbNum($className);
                 $tableName = $tableName.'_'.self::getDbNum($className);
                 //设置分表对应的className
                 //设置分表对应的className
-                EntityCollector::setCollector($tableName, $defaultTbleName);
+                EntityCollector::setCollector($tableName, $defaultTableName);
 
 
             }
             }
 
 
@@ -63,10 +63,6 @@ class Split
         $splitCollector = SplitCollector::getCollector();
         $splitCollector = SplitCollector::getCollector();
         $splitNum = $splitCollector[$className]['num'];
         $splitNum = $splitCollector[$className]['num'];
         $data = RequestContext::getContextData();
         $data = RequestContext::getContextData();
-        $dbNum = $data['dbNum'];
-        if ( ! empty($dbNum) ) {//若手动设置的分表信息则直接返回设置的表号
-            return $dbNum;
-        }
 
 
         $storeId = $data['userInfo']['storeId'];
         $storeId = $data['userInfo']['storeId'];
 
 

src/Common/Entity/User.php

@@ -120,6 +120,17 @@ class User
         $this->setValue('token', $value);
         $this->setValue('token', $value);
     }
     }
 
 
+    public function setSubStoreId($value)
+    {
+        $this->setValue('subStoreId', $value);
+    }
+
+    public function getSubStoreId()
+    {
+        return $this->getValue('subStoreId')??0;
+    }
+
+
 
 
     public function fill($arr)
     public function fill($arr)
     {
     {

src/Order/Lib/OrderInterface.php

@@ -232,6 +232,13 @@ interface OrderInterface
 
 
     /**
     /**
      * 统计核销
      * 统计核销
+     *
+     * array(2) {
+    ["money"]=>
+    string(1) "8"
+    ["orders"]=>
+    string(1) "6"
+    }
      * @param int $storeId
      * @param int $storeId
      * @return mixed
      * @return mixed
      */
      */