From c99ef607889907896e3c94fb6ae5fcae92e06cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= Date: Mon, 28 Apr 2025 16:28:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=BC=82=E5=B8=B8=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=87=8D=E5=A4=8D=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/services/OrderAbnormalService.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/application/services/OrderAbnormalService.php b/application/services/OrderAbnormalService.php index bf953eb..77772a8 100644 --- a/application/services/OrderAbnormalService.php +++ b/application/services/OrderAbnormalService.php @@ -12,11 +12,6 @@ class OrderAbnormalService extends BaseService */ public function create(int $workerId, array $params) { - $data = $this->getOrderAbnormal($workerId, $params['order_id']); - if ($data) { - $this->apiError('您已上报过异常，请勿重复提交'); - } - $abnormal = $this->getAbnormalModel()->find($params['abnormal_id']); if (!$abnormal) { $this->apiError('异常原因不存在，请重新选择'); From 69cd09a63ead3061cffd10bd8449ca33171cec45 Mon Sep 17 00:00:00 2001 From: hant Date: Mon, 28 Apr 2025 20:07:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/orderplan/index.html | 152 +++++++++++++++++++- 1 file changed, 151 insertions(+), 1 deletion(-) diff --git a/application/admin/view/orderplan/index.html b/application/admin/view/orderplan/index.html index dd7e303..cc916c8 100644 --- a/application/admin/view/orderplan/index.html +++ b/application/admin/view/orderplan/index.html @@ -469,6 +469,119 @@ +
+

热门服务

+ +
+
🥇
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+
+
+
🥈
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+
+
+
🥉
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+
+ +
+
#4
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
#5
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
#6
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+

热门服务

+ +
+
🥇
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+
+
+
🥈
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+
+
+
🥉
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
+
+ +
+
#4
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
#5
+
+
日常保洁
+
销量47 (19%)
+
+
+
+
#6
+
+
日常保洁
+
销量47 (19%)
+
+
+
+ \ No newline at end of file From 51721c104af688586cd39819baf089fd5be8aac2 Mon Sep 17 00:00:00 2001 From: hant Date: Mon, 28 Apr 2025 22:22:21 +0800 Subject: [PATCH 3/4] ditu --- public/assets/js/addons.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js index f8a8cfa..177dd6d 100755 --- a/public/assets/js/addons.js +++ b/public/assets/js/addons.js @@ -12,9 +12,9 @@ define([], function () { var zoom_id = $(that).data("zoom-id") ? $(that).data("zoom-id") : ""; var lat = lat_id ? $("#" + lat_id).val() : ''; var lng = lng_id ? $("#" + lng_id).val() : ''; - var city_code = $("#area_id").val(); + var city_code = $("#c-city").val(); var zoom = zoom_id ? $("#" + zoom_id).val() : ''; - var url = "/addons/address/index/select?1=1"; + var url = "/addons/address/index/select?a=1"; url += (lat && lng) ? 'lat=' + lat + '&lng=' + lng + (input_id ? "&address=" + $("#" + input_id).val() : "") +(zoom ? "&zoom=" + zoom : "") : '' From 62df6dda501470e78086dc5906570fe27d3e842e Mon Sep 17 00:00:00 2001 From: gcd Date: Mon, 28 Apr 2025 23:02:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=B9=B3=E5=8F=B0=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E4=B8=8D=E9=9C=80=E8=A6=81=E6=8F=90=E4=BA=A4=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/services/OrderDispatchService.php | 21 +++++++++++-------- application/worker/validate/OrderDispatch.php | 8 ++++--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/application/services/OrderDispatchService.php b/application/services/OrderDispatchService.php index 7a9431e..24cd514 100644 --- a/application/services/OrderDispatchService.php +++ b/application/services/OrderDispatchService.php @@ -329,18 +329,21 @@ class OrderDispatchService extends BaseService $orderDispatch = $this->getOrderDispatchInfo($workerId, $params['order_dispatch_id']); $orderDispatch->status = OrderDispatch::STATUS_FINISH; $orderDispatch->images = $this->removeStrCdnUrl($params['complete_images']); - $orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']); - $orderDispatch->offline_total_type = $params['offline_total_type']; $orderDispatch->finish_time = $time; - //线下尾款 - if ($params['final_payment_method'] == 1) { - $orderDispatch->total = $params['amount']; - } + if ($params['receive_type'] === 1) { + $orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']); + $orderDispatch->offline_total_type = $params['offline_total_type']; - //线上尾款 - if ($params['final_payment_method'] == 2) { - $orderDispatch->online_total = $params['amount']; + //线下尾款 + if ($params['final_payment_method'] == 1) { + $orderDispatch->total = $params['amount']; + } + + //线上尾款 + if ($params['final_payment_method'] == 2) { + $orderDispatch->online_total = $params['amount']; + } } $orderDispatch->save(); diff --git a/application/worker/validate/OrderDispatch.php b/application/worker/validate/OrderDispatch.php index 0e01e33..0937eed 100644 --- a/application/worker/validate/OrderDispatch.php +++ b/application/worker/validate/OrderDispatch.php @@ -14,10 +14,12 @@ class OrderDispatch extends Validate 'images|上门图片' => 'require|max:3000', 'complete_images|完成图片' => 'require|max:3000', - 'final_payment_method|收款方式' => 'require|in:1,2', - 'amount|收款金额' => 'require|number|between:0,10000000', - 'payment_image|收款图片' => 'require|max:255', + 'final_payment_method|收款方式' => 'requireIf:receive_type,1|in:1,2', + 'amount|收款金额' => 'requireIf:receive_type,1|number|between:0,10000000', + 'payment_image|收款图片' => 'requireIf:receive_type,1|max:255', 'offline_total_type|尾款收款方' => 'in:0,1,2', + 'receive_type' => 'require|in:1,2', + 'reject_reason|拒接原因' => 'max:100', 'worker_remark|备注信息' => 'max:500', ];