From 16ee3f87331375f3823328222d7710baa285168e Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 11 May 2023 10:15:16 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adminapi/controller/v1/order/StoreOrder.php | 3 +-- crmeb/app/outapi/controller/StoreOrder.php | 4 +--- crmeb/app/services/order/OutStoreOrderServices.php | 4 ++-- .../services/order/StoreOrderDeliveryServices.php | 14 +++++++------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php index 4bf6f7c0a..ed2b3d23d 100644 --- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php @@ -254,8 +254,7 @@ class StoreOrder extends AuthController ['fictitious_content', '']//虚拟发货内容 ]); - $services->delivery((int)$id, $data); - return app('json')->success(100010); + return app('json')->success(100010, $services->delivery((int)$id, $data)); } /** diff --git a/crmeb/app/outapi/controller/StoreOrder.php b/crmeb/app/outapi/controller/StoreOrder.php index e2509ed14..b01f9772c 100644 --- a/crmeb/app/outapi/controller/StoreOrder.php +++ b/crmeb/app/outapi/controller/StoreOrder.php @@ -88,9 +88,7 @@ class StoreOrder extends AuthController ]); $data['express_record_type'] = 1; $data['type'] = 1; - - $this->services->delivery($order_id, $data); - return app('json')->success(100010); + return app('json')->success(100010, $this->services->delivery($order_id, $data)); } /** diff --git a/crmeb/app/services/order/OutStoreOrderServices.php b/crmeb/app/services/order/OutStoreOrderServices.php index 886dd3fbd..bc1f5508d 100644 --- a/crmeb/app/services/order/OutStoreOrderServices.php +++ b/crmeb/app/services/order/OutStoreOrderServices.php @@ -303,12 +303,12 @@ class OutStoreOrderServices extends BaseServices * 发货 * @param string $orderId 订单号 * @param array $data - * @return bool + * @return array * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function delivery(string $orderId, array $data): bool + public function delivery(string $orderId, array $data) { $orderInfo = $this->dao->get(['order_id' => $orderId]); if (!$orderInfo) { diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index 5d6409161..3819bbb1a 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -45,7 +45,7 @@ class StoreOrderDeliveryServices extends BaseServices * 订单发货 * @param int $id * @param array $data - * @return bool + * @return array */ public function delivery(int $id, array $data) { @@ -80,8 +80,7 @@ class StoreOrderDeliveryServices extends BaseServices if ($storeOrderRefundServices->count(['store_order_id' => $id, 'refund_type' => [1, 2, 4, 5], 'is_cancel' => 0, 'is_del' => 0])) { throw new AdminException(400475); } - $this->doDelivery($id, $orderInfo, $data); - return true; + return $this->doDelivery($id, $orderInfo, $data); } /** @@ -431,7 +430,7 @@ class StoreOrderDeliveryServices extends BaseServices * @param int $id * @param $orderInfo * @param array $data - * @return bool + * @return array */ public function doDelivery(int $id, $orderInfo, array $data) { @@ -441,9 +440,10 @@ class StoreOrderDeliveryServices extends BaseServices /** @var StoreOrderCartInfoServices $orderInfoServices */ $orderInfoServices = app()->make(StoreOrderCartInfoServices::class); $storeName = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id); + $res = []; switch ($type) { case 1://快递发货 - $this->orderDeliverGoods($id, $data, $orderInfo, $storeName); + $res = $this->orderDeliverGoods($id, $data, $orderInfo, $storeName); event('NoticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']); break; case 2://配送 @@ -458,7 +458,7 @@ class StoreOrderDeliveryServices extends BaseServices } //到期自动收货 event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]); - return true; + return $res; } /** @@ -543,7 +543,7 @@ class StoreOrderDeliveryServices extends BaseServices throw new AdminException(400529); } }); - return true; + return $dump; } /** From de4a7d778acbe5ce70649a1d1b96fbe277d5f5ff Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 11 May 2023 10:28:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=AB=99=E7=82=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/admin/SystemAdminServices.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php index 96d28785c..0cacdc8bc 100644 --- a/crmeb/app/services/system/admin/SystemAdminServices.php +++ b/crmeb/app/services/system/admin/SystemAdminServices.php @@ -145,7 +145,8 @@ class SystemAdminServices extends BaseServices 'version' => get_crmeb_version(), 'newOrderAudioLink' => get_file_link(sys_config('new_order_audio_link', '')), 'queue' => $queue ?? true, - 'timer' => $timer ?? true + 'timer' => $timer ?? true, + 'site_name' => sys_config('site_name'), ]; } From 208a0f132e8465124d5b5fb0929ada2a2175521c Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 11 May 2023 10:46:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/AccessTokenServeService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/crmeb/services/AccessTokenServeService.php b/crmeb/crmeb/services/AccessTokenServeService.php index 1d39fd59c..489e5d2f1 100644 --- a/crmeb/crmeb/services/AccessTokenServeService.php +++ b/crmeb/crmeb/services/AccessTokenServeService.php @@ -54,7 +54,7 @@ class AccessTokenServeService extends HttpService /** * @var string */ - protected $sandBoxApi = 'https://api_v2.crmeb.net/'; + protected $sandBoxApi = 'https://api_v2.crmeb.net/api/'; /** * @var bool From 085d83e2ce7c93c4332e39230d3283c158811aa1 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 11 May 2023 10:50:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/express/storage/Express.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crmeb/crmeb/services/express/storage/Express.php b/crmeb/crmeb/services/express/storage/Express.php index cb3b796d1..85393992f 100644 --- a/crmeb/crmeb/services/express/storage/Express.php +++ b/crmeb/crmeb/services/express/storage/Express.php @@ -147,9 +147,9 @@ class Express extends BaseExpress throw new AdminException(400712); } $param['siid'] = sys_config('config_export_siid'); - if (!$param['siid']) { - throw new AdminException(400716); - } +// if (!$param['siid']) { +// throw new AdminException(400716); +// } $param['count'] = $data['count'] ?? ''; $param['cargo'] = $data['cargo'] ?? ''; if (!$param['count']) { From e28589635c0a8d1e0e6ab895b7dff66cc91960c6 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 11 May 2023 11:59:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=86=99=E5=85=A5=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=B0=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderDeliveryServices.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index 3819bbb1a..a677d5b0a 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -519,6 +519,9 @@ class StoreOrderDeliveryServices extends BaseServices 'cargo' => $expData['cargo'], ]); $data['delivery_id'] = $dump['kuaidinum']; + if (!empty($dump['label'])) { + $data['kuaidi_label'] = $dump['label']; + } } else { if (!$data['delivery_id']) { throw new AdminException(400531); From 44e4710aee32d5bbe3cd6ec3addbef5065f150fe Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 11 May 2023 14:21:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/crmeb.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index 792b257fc..75ad3aaa0 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -47271,7 +47271,6 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (1069, 1067, '', '语言详情', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/lang/info', '12/1067', 1, '', 0, 'admin-lang-info', 0), (1070, 1067, '', '地区列表', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/lang/country', '25/1067', 1, '', 0, 'admin-lang-country', 0), (1071, 1695, '', '文件管理', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/maintain/system_file/opendir', '25/1695', 1, '', 0, 'system-maintain-system-file', 0), -(1072, 1064, '', '接口文档', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/system_out_interface/index', '56/1064', 1, '', 0, 'setting-system-out-interface-index', 0), (1073, 25, '', '数据维护', 'admin', '', '', '', '', '[]', 7, 1, 1, 1, 'system/database/index', '25', 1, '', 0, 'system-database-index', 0), (1075, 731, '', '会员配置', 'admin', '', '', '', '', '[]', 6, 1, 1, 1, '/marketing/member/system_config/3/67', '27/731', 1, '', 0, 'marketing-member-system_config', 0), (1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0), From 5a86f0a3693447f443c6795526bab0040448abbf Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 11 May 2023 14:29:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E8=8F=9C=E5=8D=95=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 1 + 1 file changed, 1 insertion(+) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index d9edd9ef3..ae21a526e 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -560,6 +560,7 @@ class SystemCrudServices extends BaseServices 'menu_path' => '/' . $routeName, 'auth_type' => 1, 'is_show' => 1, + 'is_show_path' => 1, 'is_del' => 0, 'unique_auth' => $uniqueAuth, 'is_header' => $data['pid'] ? 0 : 1,