diff --git a/config/wms.php b/config/wms.php index 7722f45..1b84660 100644 --- a/config/wms.php +++ b/config/wms.php @@ -24,6 +24,6 @@ return [ 'sign_method' => 'md5', 'warehouse_code' => env('GWALL_WAREHOUSE_CODE', 'test0912'), 'shipper_code' => env('GWALL_SHIPPER_CODE', 'BJPD'), - 'warehouse_id' => env('GWALL_WAREHOUSE_ID', 2), + 'warehouse_id' => env('GWALL_WAREHOUSE_ID', 18), ], ]; diff --git a/src/BaseWms.php b/src/BaseWms.php index 90e0aaa..c469db6 100644 --- a/src/BaseWms.php +++ b/src/BaseWms.php @@ -4,16 +4,6 @@ namespace PdWms; class BaseWms { - const DEFAULT_SHOP_NAME = '北京拍店'; - const DEFAULT_SELLER_NICK = '北京拍店'; - const DEFAULT_SENDER_NAME = '北京拍店'; - const DEFAULT_SENDER_MOBILE = '18816537510'; - const DEFAULT_SENDER_PROVINCE = '浙江省'; - const DEFAULT_SENDER_CITY = '嘉兴市'; - const DEFAULT_SENDER_AREA = '秀洲区'; - const DEFAULT_SENDER_ADDRESS = '岗山路75号维龙仓储3号库'; - const DEFAULT_ZIP_CODE = '000000'; - const RK_TYPE = [ '0' => 'CGRK', '10' => 'DBRK', diff --git a/src/GwallWms.php b/src/GwallWms.php index ba9bacf..2dee817 100644 --- a/src/GwallWms.php +++ b/src/GwallWms.php @@ -4,6 +4,16 @@ namespace PdWms; class GwallWms extends QimenWms { + protected static $default_shop_name = '北京拍店'; + protected static $default_seller_nick = '北京拍店'; + protected static $default_sender_name = '北京拍店'; + protected static $default_sender_mobile = '17606553430'; + protected static $default_sender_province = '浙江省'; + protected static $default_sender_city = '绍兴市'; + protected static $default_sender_area = '诸暨市'; + protected static $default_sender_address = '王家湖路22号大壹云仓'; + protected static $default_zip_code = '000000'; + public function __construct($config = null) { $wmsConf = $config ?? (require(dirname(dirname(__FILE__)) . '/config/wms.php'))['gwall']; diff --git a/src/QimenWms.php b/src/QimenWms.php index 36782a9..26092ac 100644 --- a/src/QimenWms.php +++ b/src/QimenWms.php @@ -13,6 +13,16 @@ use PdWms\Service\XML2Array; class QimenWms extends BaseWms implements WmsInterface { + protected static $default_shop_name = '北京拍店'; + protected static $default_seller_nick = '北京拍店'; + protected static $default_sender_name = '北京拍店'; + protected static $default_sender_mobile = ''; + protected static $default_sender_province = ''; + protected static $default_sender_city = ''; + protected static $default_sender_area = ''; + protected static $default_sender_address = ''; + protected static $default_zip_code = '000000'; + protected $config = []; public function __construct($config = null) @@ -38,22 +48,22 @@ class QimenWms extends BaseWms implements WmsInterface 'createTime' => date('Y-m-d H:i:s'), //发货单创建时间 'placeOrderTime' => $order['created_at'], //前台订单 (店铺订单) 创建时间 (下单时间) 'operateTime' => date('Y-m-d H:i:s'), //操作 (审核) 时间 - 'shopNick' => $order['order_sender_info']['shop_name'] ?? self::DEFAULT_SHOP_NAME, - 'sellerNick' => $order['order_sender_info']['shop_name'] ?? self::DEFAULT_SELLER_NICK, + 'shopNick' => $order['order_sender_info']['shop_name'] ?? static::$default_shop_name, + 'sellerNick' => $order['order_sender_info']['shop_name'] ?? static::$default_seller_nick, 'remark' => $order['remark'], //发货人信息 'senderInfo' => [ - 'name' => $order['order_sender_info']['name'] ?? self::DEFAULT_SENDER_NAME, - 'mobile' => $order['order_sender_info']['tel'] ?? self::DEFAULT_SENDER_MOBILE, - 'province' => self::DEFAULT_SENDER_PROVINCE, - 'city' => self::DEFAULT_SENDER_CITY, - 'area' => self::DEFAULT_SENDER_AREA, - 'detailAddress' => self::DEFAULT_SENDER_ADDRESS, + 'name' => $order['order_sender_info']['name'] ?? static::$default_sender_name, + 'mobile' => $order['order_sender_info']['tel'] ?? static::$default_sender_mobile, + 'province' => static::$default_sender_province, + 'city' => static::$default_sender_city, + 'area' => static::$default_sender_area, + 'detailAddress' => static::$default_sender_address, ], //收件人信息 'receiverInfo' => [ 'name' => $this->filterEmoji($order['order_address']['receive_name']), - 'zipCode' => $order['order_address']['receive_zip_code'] ?? self::DEFAULT_ZIP_CODE, + 'zipCode' => $order['order_address']['receive_zip_code'] ?? static::$default_zip_code, 'mobile' => trim($order['order_address']['receive_mobile']), 'province' => $order['order_address']['receive_province'], 'city' => $order['order_address']['receive_city'], diff --git a/src/XinyiWms.php b/src/XinyiWms.php index d29124c..25ac29d 100644 --- a/src/XinyiWms.php +++ b/src/XinyiWms.php @@ -13,6 +13,16 @@ use GuzzleHttp\Client; class XinyiWms extends BaseWms implements WmsInterface { + const DEFAULT_SHOP_NAME = '北京拍店'; + const DEFAULT_SELLER_NICK = '北京拍店'; + const DEFAULT_SENDER_NAME = '北京拍店'; + const DEFAULT_SENDER_MOBILE = '18816537510'; + const DEFAULT_SENDER_PROVINCE = '浙江省'; + const DEFAULT_SENDER_CITY = '嘉兴市'; + const DEFAULT_SENDER_AREA = '秀洲区'; + const DEFAULT_SENDER_ADDRESS = '岗山路75号维龙仓储3号库'; + const DEFAULT_ZIP_CODE = '000000'; + protected $config = []; public function __construct($config = null)