Merge branch 'feature/new_wms' into 'master'

修改快递回传方法

See merge request composer/php-wms-client!11
This commit is contained in:
赵杰 2020-09-04 11:54:01 +08:00
commit 0d39edd856
2 changed files with 5 additions and 1 deletions

View File

@ -9,10 +9,12 @@ return [
[ [
'code' => 'CN7000001000869', 'code' => 'CN7000001000869',
'name' => '安能快运', 'name' => '安能快运',
'is_default' => false,
], ],
[ [
'code' => 'CN7000001003751', 'code' => 'CN7000001003751',
'name' => '跨越', 'name' => '跨越',
'is_default' => false,
], ],
], ],
@ -20,6 +22,7 @@ return [
[ [
'code' => 'STO', 'code' => 'STO',
'name' => '申通', 'name' => '申通',
'is_default' => false,
], ],
] ]
], ],

View File

@ -146,7 +146,8 @@ 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);
return $expressChooseConf['logistics'][$type]; $expressChooseConf['logistics'][$type][0]['is_default'] = true;
return collect([$expressChooseConf['logistics']['toC'], $expressChooseConf['logistics']['toB']])->collapse()->all();
} }
/** /**