Skip to content

M
my-yaf-project
Commit e9038e76 authored by testshenbd's avatar testshenbd
Browse files
Options

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

parents 72a32286 e5fde739
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
application/library/Order/OrderConfirmUtil.php
View file @ e9038e76
...@@ -630,7 +630,7 @@ class OrderConfirmUtil { ...@@ -630,7 +630,7 @@ class OrderConfirmUtil {
$orderGoods['order_id'] = $orderId; $orderGoods['order_id'] = $orderId;
$orderGoods['goods_id'] = $storeCart['goodsId']; $orderGoods['goods_id'] = $storeCart['goodsId'];
$orderGoods['goods_name'] = $storeCart['goodsName']; $orderGoods['goods_name'] = $storeCart['goodsName'];
$goods_datas[] = $orderGoodsDao['goods_name']; $goods_datas[] = $orderGoods['goods_name'];
$orderGoods['goods_num'] = $storeCart['goodsNum']; $orderGoods['goods_num'] = $storeCart['goodsNum'];
$orderGoods['goods_image'] = $storeCart['goodsImagePath']; $orderGoods['goods_image'] = $storeCart['goodsImagePath'];
$orderGoods['snapshot_id'] = (isset($storeCarts['snapshot_id'])&&$storeCarts['snapshot_id'])?$storeCarts['snapshot_id']:\our\ApiConst::zero; $orderGoods['snapshot_id'] = (isset($storeCarts['snapshot_id'])&&$storeCarts['snapshot_id'])?$storeCarts['snapshot_id']:\our\ApiConst::zero;
...@@ -741,7 +741,7 @@ class OrderConfirmUtil { ...@@ -741,7 +741,7 @@ class OrderConfirmUtil {
* Date: 2018/12/27 0027 * Date: 2018/12/27 0027
* Time: 下午 3:15 * Time: 下午 3:15
*/ */
private function getLitAccesstoken(){ /*private function getLitAccesstoken(){
$model_wx = \DAO\MbWxModel::getInstance(); $model_wx = \DAO\MbWxModel::getInstance();
$weixin = $model_wx->getOne('id,lit_appid,lit_appsecret,lit_accesstoken,lit_expirestime', 'id=1'); $weixin = $model_wx->getOne('id,lit_appid,lit_appsecret,lit_accesstoken,lit_expirestime', 'id=1');
$access_token = ''; $access_token = '';
...@@ -761,7 +761,7 @@ class OrderConfirmUtil { ...@@ -761,7 +761,7 @@ class OrderConfirmUtil {
$access_token = $weixin['lit_accesstoken']; $access_token = $weixin['lit_accesstoken'];
} }
return $access_token; return $access_token;
} }*/
/** /**
* curl请求 * curl请求
...@@ -770,7 +770,7 @@ class OrderConfirmUtil { ...@@ -770,7 +770,7 @@ class OrderConfirmUtil {
* @param $data * @param $data
* @param $method * @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') { if(strtolower($method)=='post') {
$curl = curl_init(); $curl = curl_init();
...@@ -807,7 +807,7 @@ class OrderConfirmUtil { ...@@ -807,7 +807,7 @@ class OrderConfirmUtil {
$r = curl_exec($curl); $r = curl_exec($curl);
curl_close($curl); curl_close($curl);
return $r; return $r;
} }*/
public function pushMessage(){ public function pushMessage(){
if($this->pushMessageOrders){ if($this->pushMessageOrders){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment