xiugai

app/libs/daos/Order/OpOrderDao.php

@@ -17,6 +17,8 @@ use StatusConst;
 use ZcArrayHelper;
 
 class OpOrderDao extends AbstractDao {
+    protected $pk = 'order_id';
+    
     public function searchPage($filterMallIds, $filterCondition, $page, $pageSize) {
         list($conditions, $joinTables) = $this->getSearchOrderCondition($filterCondition, $filterMallIds);
 		$whereStr = !empty($conditions) ? implode(' ', $conditions) : '';

app/libs/tool/class.HtmlTool.php

@@ -141,7 +141,7 @@ class HtmlTool {
 	public static function getStaticCommonFile($files, $forceTimestamp = '') {
         $static = array();
         $staticDir = str_replace('\\', '/', Zc::C(ZcConfigConst::DirWsApp));
-		$apiPath = stripos(Zc::C('static.domain'), '.api.') != false ? '/' : '/api/';
+		$apiPath = stripos(Zc::C('static.domain'), 'api.') === 0 ? '/' : '/api/';
         $staticUrlPart = AppConst::getCurProtocol() . '://' . Zc::C('static.domain') . $apiPath . $staticDir . 'views/static_common/';
         $files = is_array($files) ? $files : [$files];
         foreach ($files as $file) {

app/libs/vendor/pddAjaxApi/PddOAuthClient.php

@@ -148,7 +148,6 @@ class PddOAuthClient {
 			$this->logInvoke($request, $accessToken, $ss, 'api_params_check_fail', $checkRet['code']);
 			return $checkRet;
 		}
-		
 		$needSendParams = $this->buildNeedSendParams($request, $accessToken);
 		// 发送http请求
 		$maxTimes = 3;