Merge remote-tracking branch 'origin/test' into test

src/Common/Config/Bean/ScanPath.php

 <?php
-/**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2018/7/16
- * Time: 9:32
- */
+
+// 以下用于swoft加载自定义的类
 $scanPaths = include __DIR__.'/PathConfig.php';
 $data = [];
-
 foreach ($scanPaths as $basePath) {
     $files = \Swoft\Helper\DirHelper::glob($basePath,'*.php');
     $baseNamespace = "Hdll\Services\\";
@@ -42,11 +37,8 @@ foreach ($scanPaths as $basePath) {
 
         }
 
-
     }
 
-
 }
 
-
 return $data;
\ No newline at end of file

src/Common/Func.php

+<?php
+//================================//
+// 公共函数库
+//================================//
+
+// 执行数据库操作，并对返回结果进行处理
+if(!function_exists('dbQuery')) {
+	function dbQuery($result) {
+        if($result instanceof \Swoft\Core\ResultInterface) {
+            $result = $result->getResult();
+        }
+		if($result === false) {
+            throw new \Exception('数据库操作错误[return:false]');
+        }
+        if(!is_array($result) && !is_object($result)) {
+            return $result; //字符串或数字等类型直接返回
+        }
+        if(is_object($result) && \method_exists($result, 'toArray')) {
+            $result = $result->toArray();
+        }
+        foreach ($result as $key => $value) {
+            if(is_array($value) || is_object($value)) {
+                $result[$key] = dbQuery($value);
+                continue;
+            }
+            if($key == 'deleteTime') unset($result[$key]);
+        }
+        return $result;
+	}
+}
\ No newline at end of file

src/Order/Lib/OrderInterface.php

@@ -22,7 +22,6 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoByIds(int $storeId,array $orderIds, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoByPids(int $storeId,array $pIds,array $updateInfo)
- * @method ResultInterface deferUpdateMainOrderByPid(int $storeId,int $pId,array $mainData,array $subData=[])
  * @method ResultInterface deferUnconfirmedCount(int $storeId)
  * @method ResultInterface deferGetSubOrderListBySubIds(int $storeId,array $ids,int $arg=1)
  * @method ResultInterface deferOrderCount(int $storeId,int $orderType,array $itemIds)
@@ -149,7 +148,7 @@ interface OrderInterface
      * @param array $subData
      * @return bool
      */
-    public function payCallback(int $storeId,int $pId,array $mainData,array $subData=[]);
+    public function payCallback(int $storeId,int $pId,array $mainData,array $subData);
     
     /**
      * 获取未入账统计

src/Wx3rd/Lib/EntrustedInterface.php

@@ -46,6 +46,14 @@ interface EntrustedInterface
     public function getEntAccessToken($storeId);
 
     /**
+     * 获取托管小程序的订阅消息模板
+     * @param int $storeId
+     * @param int $tid 模板编号，产品原型图上会给出
+     * @return array
+     */
+    public function getNoticeTemplate(int $storeId, int $tid);
+    
+    /**
      * 根据店铺id和商户平台id获取对应的支付证书
      * 
      * @param int $storeId