From 8d7f1aa1a48b4554db0e9ce274b5b56fc9c750b6 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 25 Jun 2023 11:12:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E4=BA=91=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/upload/storage/Jdoss.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/crmeb/services/upload/storage/Jdoss.php b/crmeb/crmeb/services/upload/storage/Jdoss.php index 34945bfed..5a7f4a8ce 100644 --- a/crmeb/crmeb/services/upload/storage/Jdoss.php +++ b/crmeb/crmeb/services/upload/storage/Jdoss.php @@ -176,7 +176,8 @@ class Jdoss extends BaseUpload 'Key' => $key, 'Body' => $fileContent ]); - if (!isset($uploadInfo['info']['url'])) { + $uploadInfo = $uploadInfo->toArray(); + if (isset($uploadInfo['@metadata']['statusCode']) && $uploadInfo['@metadata']['statusCode'] !== 200) { return $this->setError('Upload failure'); } $this->fileInfo->uploadInfo = $uploadInfo; From d28606305a554eac19fc51c4f838e4aa3c76a175 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 25 Jun 2023 14:12:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/printer/storage/FeiEYun.php | 2 +- crmeb/crmeb/services/printer/storage/YiLianYun.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/crmeb/services/printer/storage/FeiEYun.php b/crmeb/crmeb/services/printer/storage/FeiEYun.php index a1858498e..87529924e 100644 --- a/crmeb/crmeb/services/printer/storage/FeiEYun.php +++ b/crmeb/crmeb/services/printer/storage/FeiEYun.php @@ -70,7 +70,7 @@ class FeiEYun extends BasePrinter $this->printerContent .= '名称 单价 数量 金额
'; $this->printerContent .= '--------------------------------
'; foreach ($product as $item) { - $name = $item['productInfo']['store_name']; + $name = $item['productInfo']['store_name'] . " | " . $item['productInfo']['attrInfo']['suk']; $price = $item['truePrice']; $num = $item['cart_num']; $prices = bcmul((string)$item['cart_num'], (string)$item['truePrice'], 2); diff --git a/crmeb/crmeb/services/printer/storage/YiLianYun.php b/crmeb/crmeb/services/printer/storage/YiLianYun.php index df20b7596..c9d787eb3 100644 --- a/crmeb/crmeb/services/printer/storage/YiLianYun.php +++ b/crmeb/crmeb/services/printer/storage/YiLianYun.php @@ -72,7 +72,7 @@ class YiLianYun extends BasePrinter foreach ($product as $item) { $goodsStr .= ''; $price = bcmul((string)$item['cart_num'], (string)$item['truePrice'], 2); - $goodsStr .= "{$item['productInfo']['store_name']}{$item['cart_num']}{$item['truePrice']}{$price}"; + $goodsStr .= "{$item['productInfo']['store_name']} | {$item['productInfo']['attrInfo']['suk']}{$item['cart_num']}{$item['truePrice']}{$price}"; $goodsStr .= ''; unset($price); } From 047e6ee4b361ffc27a3bb853740a1bd29914a95e Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 25 Jun 2023 14:54:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=AF=86=E7=A0=81=E4=B8=BA=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php b/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php index 3350b2925..ef939a3c4 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php @@ -169,9 +169,13 @@ class SystemAdmin extends AuthController ['new_pwd', ''], ['conf_pwd', ''], ]); - if (!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,}$/', $data['new_pwd'])) { - return app('json')->fail(400183); + + if ($data['pwd']) { + if (!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,}$/', $data['new_pwd'])) { + return app('json')->fail(400183); + } } + if ($this->services->updateAdmin($this->adminId, $data)) return app('json')->success(100001); else From ed53a01bb3db76ad8850b67c3a84d48b7dcd2123 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 25 Jun 2023 14:56:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php | 2 +- crmeb/route/route.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php b/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php index ef939a3c4..d8b73d3b7 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php @@ -175,7 +175,7 @@ class SystemAdmin extends AuthController return app('json')->fail(400183); } } - + if ($this->services->updateAdmin($this->adminId, $data)) return app('json')->success(100001); else diff --git a/crmeb/route/route.php b/crmeb/route/route.php index 49ea79f88..503153644 100644 --- a/crmeb/route/route.php +++ b/crmeb/route/route.php @@ -14,6 +14,7 @@ Route::miss(function () { switch (strtolower($appName)) { case config('app.admin_prefix', 'admin'): case 'kefu': + case 'app': return view(app()->getRootPath() . 'public' . DS . config('app.admin_prefix', 'admin') . DS . 'index.html'); case 'home': if (request()->isMobile()) { From 0fce28dd12a42c9946186451b88d4fb52b5f2400 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 25 Jun 2023 15:44:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/admin/StoreOrderController.php | 78 +++++++++++++++++++ crmeb/app/api/route/v1.php | 1 + 2 files changed, 79 insertions(+) diff --git a/crmeb/app/api/controller/v1/admin/StoreOrderController.php b/crmeb/app/api/controller/v1/admin/StoreOrderController.php index 17ab9ec7d..81cc01289 100644 --- a/crmeb/app/api/controller/v1/admin/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/admin/StoreOrderController.php @@ -46,6 +46,84 @@ class StoreOrderController $this->service = $services; } + + /** + * 订单 查看物流 + * @param StoreOrderCartInfoServices $services + * @param ExpressServices $expressServices + * @param $uni + * @param string $type + * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function express(StoreOrderServices $orderServices, StoreOrderCartInfoServices $services, ExpressServices $expressServices, $uni, $type = '') + { + if ($type == 'refund') { + /** @var StoreOrderRefundServices $refundService */ + $refundService = app()->make(StoreOrderRefundServices::class); + $order = $refundService->refundDetail($uni); + $express = $order['refund_express']; + $cacheName = $uni . $express; + $orderInfo = []; + $info = []; + $cartNew = []; + foreach ($order['cart_info'] as $k => $cart) { + $cartNew['cart_num'] = $cart['cart_num']; + $cartNew['truePrice'] = $cart['truePrice']; + $cartNew['postage_price'] = $cart['postage_price']; + $cartNew['productInfo']['image'] = $cart['productInfo']['image']; + $cartNew['productInfo']['store_name'] = $cart['productInfo']['store_name']; + $cartNew['productInfo']['unit_name'] = $cart['productInfo']['unit_name'] ?? ''; + array_push($info, $cartNew); + unset($cart); + } + $orderInfo['cartInfo'] = $info; + $orderInfo['delivery_id'] = $express; + $orderInfo['delivery_name'] = $order['refund_express_name']; + $orderInfo['delivery_code'] = ''; + } else { + if (!$uni || !($order = $orderServices->getUserOrderDetail($uni, 0, []))) { + return app('json')->fail(410173); + } + if ($type != 'refund' && ($order['delivery_type'] != 'express' || !$order['delivery_id'])) { + return app('json')->fail(410206); + } + $express = $type == 'refund' ? $order['refund_express'] : $order['delivery_id']; + $cacheName = $uni . $express; + $orderInfo = []; + $cartInfo = $services->getCartColunm(['oid' => $order['id']], 'cart_info', 'unique'); + $info = []; + $cartNew = []; + foreach ($cartInfo as $k => $cart) { + $cart = json_decode($cart, true); + $cartNew['cart_num'] = $cart['cart_num']; + $cartNew['truePrice'] = $cart['truePrice']; + $cartNew['postage_price'] = $cart['postage_price']; + $cartNew['productInfo']['image'] = $cart['productInfo']['image']; + $cartNew['productInfo']['store_name'] = $cart['productInfo']['store_name']; + $cartNew['productInfo']['unit_name'] = $cart['productInfo']['unit_name'] ?? ''; + array_push($info, $cartNew); + unset($cart); + } + $orderInfo['delivery_id'] = $express; + $orderInfo['delivery_name'] = $type == 'refund' ? '用户退回' : $order['delivery_name'];; + $orderInfo['delivery_code'] = $type == 'refund' ? '' : $order['delivery_code']; + $orderInfo['delivery_type'] = $order['delivery_type']; + $orderInfo['user_address'] = $order['user_address']; + $orderInfo['user_mark'] = $order['mark']; + $orderInfo['cartInfo'] = $info; + } + return app('json')->success([ + 'order' => $orderInfo, + 'express' => [ + 'result' => ['list' => $expressServices->query($cacheName, $orderInfo['delivery_id'], $orderInfo['delivery_code'], $order['user_phone']) + ] + ] + ]); + } + /** * 订单数据统计 * @param StoreOrderServices $services diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index 871368eec..4dedbe5ef 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -81,6 +81,7 @@ Route::group(function () { Route::get('admin/order/delivery_info', 'v1.admin.StoreOrderController/getDeliveryInfo')->name('getDeliveryInfo')->option(['real_name' => '获取电子面单默认信息']);//获取电子面单默认信息 Route::get('admin/order/export_temp', 'v1.admin.StoreOrderController/getExportTemp')->name('getExportTemp')->option(['real_name' => '获取电子面单模板获取']);//获取电子面单模板获取 Route::get('admin/order/export_all', 'v1.admin.StoreOrderController/getExportAll')->name('getExportAll')->option(['real_name' => '获取物流公司']);//获取物流公司 + Route::get('admin/order/express/:uni/[:type]', 'v1.admin.StoreOrderController/express')->name('orderExpress')->option(['real_name' => '订单查看物流']); //订单查看物流 })->middleware(\app\http\middleware\AllowOriginMiddleware::class) ->middleware(\app\api\middleware\StationOpenMiddleware::class) ->middleware(\app\api\middleware\AuthTokenMiddleware::class, true)