Merge branch 'linqing' of git.shenbd.com:qm-develop/shenbd into linqing

application/library/Order/OrderConfirmUtil.php

@@ -630,7 +630,7 @@ class OrderConfirmUtil {
                 $orderGoods['order_id'] = $orderId;
                 $orderGoods['goods_id'] = $storeCart['goodsId'];
                 $orderGoods['goods_name'] = $storeCart['goodsName'];
-                $goods_datas[] = $orderGoodsDao['goods_name'];
+                $goods_datas[] = $orderGoods['goods_name'];
                 $orderGoods['goods_num'] = $storeCart['goodsNum'];
                 $orderGoods['goods_image'] = $storeCart['goodsImagePath'];
                 $orderGoods['snapshot_id'] = (isset($storeCarts['snapshot_id'])&&$storeCarts['snapshot_id'])?$storeCarts['snapshot_id']:\our\ApiConst::zero;
@@ -741,7 +741,7 @@ class OrderConfirmUtil {
      * Date: 2018/12/27 0027
      * Time: 下午 3:15
      */
-    private function getLitAccesstoken(){
+    /*private function getLitAccesstoken(){
         $model_wx  = \DAO\MbWxModel::getInstance();
         $weixin = $model_wx->getOne('id,lit_appid,lit_appsecret,lit_accesstoken,lit_expirestime', 'id=1');
         $access_token = '';
@@ -761,7 +761,7 @@ class OrderConfirmUtil {
             $access_token = $weixin['lit_accesstoken'];
         }
         return $access_token;
-    }
+    }*/
 
     /**
      * curl请求
@@ -770,7 +770,7 @@ class OrderConfirmUtil {
      * @param $data
      * @param $method
      */
-    private function sendurl($url, $access_token = '', $data = '', $method = 'get', $header = '') {
+    /*private function sendurl($url, $access_token = '', $data = '', $method = 'get', $header = '') {
         //
         if(strtolower($method)=='post') {
             $curl = curl_init();
@@ -807,7 +807,7 @@ class OrderConfirmUtil {
         $r = curl_exec($curl);
         curl_close($curl);
         return $r;
-    }
+    }*/
 
     public function pushMessage(){
         if($this->pushMessageOrders){