From 8cb668e4b6bc165b7e2083148307aa01bb13a037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com> Date: Sat, 25 Jan 2025 15:30:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Business/BusinessOrderController.php | 6 +----- app/Services/Business/MiaoXuan/MiaoXuan.php | 19 +++++++++++++++++-- .../WayBill/JingDong/WayBillService.php | 4 +++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Business/BusinessOrderController.php b/app/Http/Controllers/Business/BusinessOrderController.php index 12955fc..0988e46 100644 --- a/app/Http/Controllers/Business/BusinessOrderController.php +++ b/app/Http/Controllers/Business/BusinessOrderController.php @@ -24,7 +24,6 @@ class BusinessOrderController extends Controller public function index(Request $request) { $shopIds = Shop::query() - ->where('plat_id', Shop::$PLAT_KTT) ->pluck('id'); $builder = BusinessOrder::query() ->with([ @@ -64,6 +63,7 @@ class BusinessOrderController extends Controller return Excel::download(new BusinessOrderExport($builder->get()->toArray()), $startDate . '~' . $endDate . "订单数据" . '.xlsx'); } + $businessOrders = $builder->orderByDesc('confirm_at') ->paginate($request->get('per_page')); @@ -179,12 +179,8 @@ class BusinessOrderController extends Controller public function print(Request $request) { - $shopIds = Shop::query() - ->where('plat_id', Shop::$PLAT_KTT) - ->pluck('id'); $builder = BusinessOrder::query() ->with('items') - ->whereIn('shop_id', $shopIds) ->filter(); $externalSkuIds = $request->get('external_sku_ids'); diff --git a/app/Services/Business/MiaoXuan/MiaoXuan.php b/app/Services/Business/MiaoXuan/MiaoXuan.php index b865284..46c2e8e 100644 --- a/app/Services/Business/MiaoXuan/MiaoXuan.php +++ b/app/Services/Business/MiaoXuan/MiaoXuan.php @@ -6,9 +6,12 @@ use App\Models\BusinessGoodsSku; use App\Models\BusinessOrderItem; use App\Models\GoodsSku; use App\Services\Business\BusinessClient; +use Carbon\Carbon; +use Illuminate\Support\Facades\Log; class MiaoXuan extends BusinessClient { + public $domain = "http://shop.dev.chutang66.com"; public function auth() { @@ -54,7 +57,7 @@ class MiaoXuan extends BusinessClient $order->cancel_status = $queryOrder['cancel_status']; $needUpdate = true; } - if ($order->after_sales_status!= $queryOrder['after_sales_status']) { + if ($order->after_sales_status != $queryOrder['after_sales_status']) { //售后状态更新 $order->after_sales_status = $queryOrder['after_sales_status']; $needUpdate = true; @@ -100,7 +103,19 @@ class MiaoXuan extends BusinessClient public function createLogistic($orderSn, $waybillNo) { - // TODO: Implement createLogistic() method. + $path = "/miaoxuan/ship"; + $url = $this->domain . $path; + $appendParams = [ + "data" => [ + "order_sn" => $orderSn, + "ship_sn" => $waybillNo, + "ship_time" => Carbon::now()->toDateTimeString(), + "company_code" => "JD", + ], + "type"=>"miaoxuan.ship" + ]; + $res =$this->formDataPostRequest($url, $appendParams); + Log::info("同步物流发货信息".$orderSn,[$res,$appendParams]); } public function cancelLogistic($orderSn, $waybillNo) diff --git a/app/Services/WayBill/JingDong/WayBillService.php b/app/Services/WayBill/JingDong/WayBillService.php index d39b9f6..d53fcc4 100644 --- a/app/Services/WayBill/JingDong/WayBillService.php +++ b/app/Services/WayBill/JingDong/WayBillService.php @@ -5,6 +5,7 @@ namespace App\Services\WayBill\JingDong; use App\Events\CreateLogisticEvent; use App\Http\Enum\BusinessOrderShippingStatus; use App\Models\BusinessOrder; +use App\Models\BusinessOrderItem; use App\Models\GoodsSku; use App\Models\ShopSender; use App\Models\ShopShip; @@ -46,6 +47,7 @@ class WayBillService $waybill->status = Waybill::$STATUS_CREATE_WAYBILL_CODE; $waybill->waybill_code = $resp['waybillNo']; $waybill->save(); + //物流发货 event(new CreateLogisticEvent($waybill->shop_id, $waybill->order_sn, $waybill->waybill_code)); } @@ -126,7 +128,7 @@ class WayBillService $waybill->wp_code = $senderConfig['wp_code']; $waybill->order_sn = $order['order_sn']; $waybill->order_id = $order['id']; - $waybill->participate_no = $order['participate_no']; + $waybill->participate_no = $order['participate_no'] ?? 0; $waybill->note = $order['note']; $waybill->items = json_encode($order['items'], 256); $waybill->save(); From 73c15ac8b75b0c098220a54c2dc21548d7d77f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com> Date: Mon, 3 Mar 2025 10:29:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Business/MiaoXuan/MiaoXuan.php | 2 +- app/Services/WayBill/JingDong/WayBillService.php | 1 + routes/console.php | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Services/Business/MiaoXuan/MiaoXuan.php b/app/Services/Business/MiaoXuan/MiaoXuan.php index 46c2e8e..79a61f1 100644 --- a/app/Services/Business/MiaoXuan/MiaoXuan.php +++ b/app/Services/Business/MiaoXuan/MiaoXuan.php @@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Log; class MiaoXuan extends BusinessClient { - public $domain = "http://shop.dev.chutang66.com"; + public $domain = "http://shop.chutang66.com"; public function auth() { diff --git a/app/Services/WayBill/JingDong/WayBillService.php b/app/Services/WayBill/JingDong/WayBillService.php index d53fcc4..15244d2 100644 --- a/app/Services/WayBill/JingDong/WayBillService.php +++ b/app/Services/WayBill/JingDong/WayBillService.php @@ -48,6 +48,7 @@ class WayBillService $waybill->waybill_code = $resp['waybillNo']; $waybill->save(); + BusinessOrder::query()->where('order_sn', $waybill->order_sn)->update(["shipping_status" => BusinessOrderShippingStatus::SHIPPED]); //物流发货 event(new CreateLogisticEvent($waybill->shop_id, $waybill->order_sn, $waybill->waybill_code)); } diff --git a/routes/console.php b/routes/console.php index 8e86ce8..4882528 100644 --- a/routes/console.php +++ b/routes/console.php @@ -1,5 +1,7 @@