github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

更新商家寄件功能

Browse Source
This commit is contained in:
evoxwht 2023-06-14 10:20:54 +08:00
parent 7c6d0c0af4
commit 6c27d69207
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crmeb/app/adminapi/controller/v1/order/StoreOrder.php
View File

@ -286,7 +286,10 @@ class StoreOrder extends AuthController
['fictitious_content', ''],//虚拟发货内容
['cart_ids', []]
['cart_ids', []],
['day_type', 0], //顺丰传 0今天，1明天，2后台
['pickup_time', []],//开始时间 9:00，结束时间 10:00 开始时间和结束时间之间不能小于一个小时
]);
if (!$id) {
return app('json')->fail(100100);

6
crmeb/app/services/order/StoreOrderDeliveryServices.php
View File

@ -440,6 +440,12 @@ class StoreOrderDeliveryServices extends BaseServices
/** @var StoreOrderCartInfoServices $orderInfoServices */
$orderInfoServices = app()->make(StoreOrderCartInfoServices::class);
$storeName = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id);
if (count($data['pickup_time']) == 2) {
$data['pickup_start_time'] = $data['pickup_time'][0];
$data['pickup_end_time'] = $data['pickup_time'][1];
}
// 发货信息录入
$res = [];
switch ($type) {

7
crmeb/crmeb/services/express/storage/Express.php
View File

@ -74,7 +74,12 @@ class Express extends BaseExpress
*/
public function getKuaidiComs()
{
return $this->accessToken->httpRequest(self::SHIPMENT_KUAIDI_NUMS, [], 'GET');
$list = $this->accessToken->httpRequest(self::SHIPMENT_KUAIDI_NUMS, [], 'GET');
foreach ($list as &$item) {
$item['code'] = $item['value'];
$item['value'] = $item['label'];
}
return $list;
}
/**