|
@@ -1,5 +1,5 @@
|
|
<?php
|
|
<?php
|
|
-namespace app\store\service\store;
|
|
|
|
|
|
+namespace app\store\service\wxApi;
|
|
|
|
|
|
use app\common\service\BaseService;
|
|
use app\common\service\BaseService;
|
|
use app\common\service\MpWxService;
|
|
use app\common\service\MpWxService;
|
|
@@ -57,12 +57,12 @@ class WxOrderLogistics extends BaseService
|
|
$params['shipping_list'] = [$shippingInfo];
|
|
$params['shipping_list'] = [$shippingInfo];
|
|
|
|
|
|
$nowStr = date('Y-m-d H:i:s');
|
|
$nowStr = date('Y-m-d H:i:s');
|
|
- $data = explode($nowStr, ' ')
|
|
|
|
|
|
+ $data = explode(' ',$nowStr);
|
|
$params['upload_time'] = $data[0].'T'.$data[1].'.000+08:00';
|
|
$params['upload_time'] = $data[0].'T'.$data[1].'.000+08:00';
|
|
$params['payer'] = [
|
|
$params['payer'] = [
|
|
'openid' => $payerOpenId
|
|
'openid' => $payerOpenId
|
|
];
|
|
];
|
|
-
|
|
|
|
|
|
+ dd($params);
|
|
$ret = curl_post($url, json_encode($params));
|
|
$ret = curl_post($url, json_encode($params));
|
|
$arr = json_decode($ret);
|
|
$arr = json_decode($ret);
|
|
|
|
|
|
@@ -71,6 +71,7 @@ class WxOrderLogistics extends BaseService
|
|
|
|
|
|
/**
|
|
/**
|
|
* 发货订单信息,如果发货物流公司是顺丰,必须保证有发件人和收件人信息,并且发件人收件人信息需要打掩码:`189****1234, 021-****1234, ****1234, 0**2-***1234, 0**2-******23-10, ****123-8008` 值限制: 0 ≤ value ≤ 1024
|
|
* 发货订单信息,如果发货物流公司是顺丰,必须保证有发件人和收件人信息,并且发件人收件人信息需要打掩码:`189****1234, 021-****1234, ****1234, 0**2-***1234, 0**2-******23-10, ****123-8008` 值限制: 0 ≤ value ≤ 1024
|
|
|
|
+ * @param $storeId
|
|
* @param $outTradeNo
|
|
* @param $outTradeNo
|
|
* @param $expressCompany
|
|
* @param $expressCompany
|
|
* @param $trackingNo
|
|
* @param $trackingNo
|
|
@@ -80,7 +81,7 @@ class WxOrderLogistics extends BaseService
|
|
* @param $receiverContact
|
|
* @param $receiverContact
|
|
* @return object
|
|
* @return object
|
|
*/
|
|
*/
|
|
- public static function orderDeliveryByOutTradeNo($outTradeNo, $expressCompany, $trackingNo, $goodsDesc, $payerOpenId, $consignorContact, $receiverContact)
|
|
|
|
|
|
+ public static function orderDeliveryByOutTradeNo($storeId,$outTradeNo, $expressCompany, $trackingNo, $goodsDesc, $payerOpenId, $consignorContact, $receiverContact)
|
|
{
|
|
{
|
|
$weixinToken = MpWxService::weixinTokenCache();
|
|
$weixinToken = MpWxService::weixinTokenCache();
|
|
$accessToken = $weixinToken['access_token'];
|
|
$accessToken = $weixinToken['access_token'];
|
|
@@ -88,11 +89,11 @@ class WxOrderLogistics extends BaseService
|
|
|
|
|
|
$params['access_token'] = $accessToken;
|
|
$params['access_token'] = $accessToken;
|
|
|
|
|
|
- $mchId = WxappModel::getWxappCache($order['store_id']);
|
|
|
|
|
|
+ $wxConfig = WxappModel::getWxappCache($storeId);
|
|
|
|
|
|
$params['order_key'] = [
|
|
$params['order_key'] = [
|
|
'order_number_type' => 1,
|
|
'order_number_type' => 1,
|
|
- 'mchid' => $mchId,
|
|
|
|
|
|
+ 'mchid' => $wxConfig['mchid'],
|
|
'out_trade_no' => $outTradeNo,
|
|
'out_trade_no' => $outTradeNo,
|
|
];
|
|
];
|
|
$params['logistics_type'] = 1;
|
|
$params['logistics_type'] = 1;
|
|
@@ -119,7 +120,7 @@ class WxOrderLogistics extends BaseService
|
|
$params['shipping_list'] = [$shippingInfo];
|
|
$params['shipping_list'] = [$shippingInfo];
|
|
|
|
|
|
$nowStr = date('Y-m-d H:i:s');
|
|
$nowStr = date('Y-m-d H:i:s');
|
|
- $data = explode($nowStr, ' ')
|
|
|
|
|
|
+ $data = explode($nowStr, ' ');
|
|
$params['upload_time'] = $data[0].'T'.$data[1].'.000+08:00';
|
|
$params['upload_time'] = $data[0].'T'.$data[1].'.000+08:00';
|
|
$params['payer'] = [
|
|
$params['payer'] = [
|
|
'openid' => $payerOpenId
|
|
'openid' => $payerOpenId
|
|
@@ -153,16 +154,17 @@ class WxOrderLogistics extends BaseService
|
|
|
|
|
|
/**
|
|
/**
|
|
* 根据outTradeNo获得订单状态,状态字段:order_state:订单状态枚举:(1) 待发货;(2) 已发货;(3) 确认收货;(4) 交易完成;(5) 已退款。
|
|
* 根据outTradeNo获得订单状态,状态字段:order_state:订单状态枚举:(1) 待发货;(2) 已发货;(3) 确认收货;(4) 交易完成;(5) 已退款。
|
|
|
|
+ * @param $storeId
|
|
* @param $outTradeNo
|
|
* @param $outTradeNo
|
|
* @return object
|
|
* @return object
|
|
*/
|
|
*/
|
|
- public static function getOrderStatusByOutTradeNo($outTradeNo) {
|
|
|
|
|
|
+ public static function getOrderStatusByOutTradeNo($storeId, $outTradeNo) {
|
|
$weixinToken = MpWxService::weixinTokenCache();
|
|
$weixinToken = MpWxService::weixinTokenCache();
|
|
$accessToken = $weixinToken['access_token'];
|
|
$accessToken = $weixinToken['access_token'];
|
|
$url = "https://api.weixin.qq.com/wxa/sec/order/get_order?access_token=".$accessToken;
|
|
$url = "https://api.weixin.qq.com/wxa/sec/order/get_order?access_token=".$accessToken;
|
|
|
|
|
|
$params['access_token'] = $accessToken;
|
|
$params['access_token'] = $accessToken;
|
|
- $mchId = WxappModel::getWxappCache($order['store_id']);
|
|
|
|
|
|
+ $mchId = WxappModel::getWxappCache($storeId);
|
|
$params['merchant_id'] = $mchId;
|
|
$params['merchant_id'] = $mchId;
|
|
$params['merchant_trade_no'] = $outTradeNo;
|
|
$params['merchant_trade_no'] = $outTradeNo;
|
|
|
|
|
|
@@ -171,4 +173,13 @@ class WxOrderLogistics extends BaseService
|
|
|
|
|
|
return $arr;
|
|
return $arr;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public static function getDeliveryList(){
|
|
|
|
+ $weixinToken = MpWxService::weixinTokenCache();
|
|
|
|
+ $accessToken = $weixinToken['access_token'];
|
|
|
|
+ $url = 'https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/get_delivery_list?access_token='.$accessToken;
|
|
|
|
+ $params = [];
|
|
|
|
+ $ret = curl_post($url, json_encode($params));
|
|
|
|
+ return json_decode($ret);
|
|
|
|
+ }
|
|
}
|
|
}
|