Compare commits

..

No commits in common. "e40c2ebdde3ba670af15815a7d27356d2d54dcbb" and "ce1efee9b1e16230208417f1ccfc6d7d68e78723" have entirely different histories.

4 changed files with 6 additions and 12 deletions

View File

@ -6,15 +6,13 @@ return [
'other_express_weight' => 45, 'other_express_weight' => 45,
'logistics' => [ 'logistics' => [
'toB' => [ 'toB' => [
[
'code' => 'CN7000001000869',
'name' => '安能快运',
'is_default' => false,
],
[ [
'code' => 'CN7000001003751', 'code' => 'CN7000001003751',
'name' => '跨越', 'name' => '跨越',
'is_default' => false, ],
[
'code' => 'CN7000001000869',
'name' => '安能快运',
], ],
], ],
@ -22,7 +20,6 @@ return [
[ [
'code' => 'STO', 'code' => 'STO',
'name' => '申通', 'name' => '申通',
'is_default' => false,
], ],
] ]
], ],

View File

@ -7,7 +7,7 @@ class FineexWms extends QimenWms
protected static $default_shop_name = '北京拍店'; protected static $default_shop_name = '北京拍店';
protected static $default_seller_nick = '北京拍店'; protected static $default_seller_nick = '北京拍店';
protected static $default_sender_name = '北京拍店'; protected static $default_sender_name = '北京拍店';
protected static $default_sender_mobile = '13012816773'; protected static $default_sender_mobile = '18867657269';
protected static $default_sender_province = '浙江省'; protected static $default_sender_province = '浙江省';
protected static $default_sender_city = '嘉兴市'; protected static $default_sender_city = '嘉兴市';
protected static $default_sender_area = '秀洲区'; protected static $default_sender_area = '秀洲区';

View File

@ -332,7 +332,6 @@ class QimenWms extends BaseWms implements WmsInterface
'area' => $params['address_area'], 'area' => $params['address_area'],
'detailAddress' => $params['address_detail'], 'detailAddress' => $params['address_detail'],
], ],
'remark' => $params['remark'] ?? '',
], ],
'orderLines' => [], 'orderLines' => [],
]; ];

View File

@ -33,7 +33,6 @@ class WmsStrategy
$logistics = $this->chooseLogisticsCompany($params['order_address']['receive_province'], $skuTotalWeight); $logistics = $this->chooseLogisticsCompany($params['order_address']['receive_province'], $skuTotalWeight);
$params['order_sender_info']['logistics_code'] = $logistics['code']; $params['order_sender_info']['logistics_code'] = $logistics['code'];
$params['order_sender_info']['logistics_name'] = $logistics['name']; $params['order_sender_info']['logistics_name'] = $logistics['name'];
$orderLogisticsType = $logistics['type'];
} else { } else {
$params['order_sender_info']['logistics_code'] = $params['express_code']; $params['order_sender_info']['logistics_code'] = $params['express_code'];
$params['order_sender_info']['logistics_name'] = self::getExpressNameByExpressCode($params['express_code']); $params['order_sender_info']['logistics_name'] = self::getExpressNameByExpressCode($params['express_code']);
@ -146,8 +145,7 @@ class WmsStrategy
{ {
$expressChooseConf = require(dirname(dirname(__FILE__)) . '/config/express_choose.php'); $expressChooseConf = require(dirname(dirname(__FILE__)) . '/config/express_choose.php');
$type = self::getOrderType($province, $weight, $expressChooseConf); $type = self::getOrderType($province, $weight, $expressChooseConf);
$expressChooseConf['logistics'][$type][0]['is_default'] = true; return $expressChooseConf['logistics'][$type];
return collect([$expressChooseConf['logistics']['toC'], $expressChooseConf['logistics']['toB']])->collapse()->all();
} }
/** /**