From 45bd66c005bffb9f0f2ecbc82a52476afe847d5a Mon Sep 17 00:00:00 2001 From: qinzexin <“731344816@qq.com”> Date: Mon, 23 Jun 2025 17:35:59 +0800 Subject: [PATCH] =?UTF-8?q?4.1:=20=20=C2=AD=C2=AD=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BAadmin=EF=BC=9A=E5=90=8E=E7=AB=AF=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=9C=AA=E4=BC=A0=E9=80=80=E6=AC=BE=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E4=BC=A0=E5=85=A5=E9=80=80=E6=AC=BE=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=20=20=20=20=20=204.2=EF=BC=9A=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E6=B4=BB=E5=8A=A8=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E8=83=BD=E6=8A=A5=E5=90=8D=EF=BC=9A=E4=B8=8E=E9=9D=99?= =?UTF-8?q?=E5=A8=B4=E5=95=86=E8=AE=AE=E5=86=B3=E5=AE=9A=E4=BF=9D=E7=95=99?= =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=9B=BF=E4=BB=96=E4=BA=BA=E6=8A=A5=E5=90=8D=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=EF=BC=88=E5=BD=95=E5=85=A5=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=89=20=20=20=20=20=204.3=EF=BC=9A=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=EF=BC=8C=E8=BF=87=E4=BA=86=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E8=AF=A5=E5=86=8D=E6=98=BE=E7=A4=BA=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=94=AE=E5=90=8E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/school/activity/order/Order.php | 2 +- .../common/model/school/activity/order/Order.php | 2 +- .../controller/school/activity/order/Order.php | 2 +- .../assets/js/backend/school/activity/activity.js | 13 +++++++++++-- .../js/backend/school/activity/order/order.js | 6 +++--- .../assets/js/manystore/school/activity/activity.js | 10 ++++++++-- .../js/manystore/school/activity/order/order.js | 2 +- 7 files changed, 26 insertions(+), 11 deletions(-) diff --git a/application/admin/controller/school/activity/order/Order.php b/application/admin/controller/school/activity/order/Order.php index c27769d..9c024f8 100644 --- a/application/admin/controller/school/activity/order/Order.php +++ b/application/admin/controller/school/activity/order/Order.php @@ -74,7 +74,7 @@ class Order extends Backend $row->getRelation('user')->visible(['nickname','realname','mobile','avatar']); $row->getRelation('activity')->visible(['title','images']); - $row->getRelation('detail')->visible(['title',"feel","price"]); + $row->getRelation('detail')->visible(['title',"feel","price","status"]); } $result = array("total" => $list->total(), "rows" => $list->items()); diff --git a/application/common/model/school/activity/order/Order.php b/application/common/model/school/activity/order/Order.php index 6880830..0e8af3d 100644 --- a/application/common/model/school/activity/order/Order.php +++ b/application/common/model/school/activity/order/Order.php @@ -1919,7 +1919,7 @@ class Order extends BaseModel case "wechat": //微信退款 // var_dump($refund_money); - self::wechatRefund($order,$refund_money,$oper_type,$oper_id); + self::wechatRefund($order,$refund_money,$refund_desc="",$oper_type,$oper_id); break; // case "alipay": //支付宝退款 // self::alipayRefund($order,$refund_money,$oper_type,$oper_id); diff --git a/application/manystore/controller/school/activity/order/Order.php b/application/manystore/controller/school/activity/order/Order.php index df964de..15abd92 100644 --- a/application/manystore/controller/school/activity/order/Order.php +++ b/application/manystore/controller/school/activity/order/Order.php @@ -79,7 +79,7 @@ class Order extends ManystoreBase foreach ($list as $row) { $row->getRelation('schoolactivity')->visible(['title','images','price']); - $row->getRelation('schoolactivityorderdetail')->visible(['title','price']); + $row->getRelation('schoolactivityorderdetail')->visible(['title','price',"status"]); $row->getRelation('user')->visible(['nickname','mobile','avatar']); } diff --git a/public/assets/js/backend/school/activity/activity.js b/public/assets/js/backend/school/activity/activity.js index 87a592c..e993f76 100644 --- a/public/assets/js/backend/school/activity/activity.js +++ b/public/assets/js/backend/school/activity/activity.js @@ -64,10 +64,19 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde {field: 'address_detail', title: __('Address_detail'), operate: 'LIKE'}, {field: 'longitude', title: __('Longitude'), operate: 'LIKE'}, {field: 'latitude', title: __('Latitude'), operate: 'LIKE'}, - {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'sign_start_time', title: __('Sign_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'sign_end_time', title: __('Sign_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + + + + {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + + + + + {field: 'price', title: __('Price'), operate:'BETWEEN'}, {field: 'stock', title: __('Stock')}, diff --git a/public/assets/js/backend/school/activity/order/order.js b/public/assets/js/backend/school/activity/order/order.js index 2dfa0f1..6889ac4 100644 --- a/public/assets/js/backend/school/activity/order/order.js +++ b/public/assets/js/backend/school/activity/order/order.js @@ -115,8 +115,8 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde }, visible: function (row) { - //只有付费订单有售后 - return (row.status == '2' || row.status == '3'|| row.status == '9') && row.detail.feel == '0'; + //只有付费订单有售后,只有活动开始后才能发起售后 + return row.detail.status != '2' && (row.status == '2' || row.status == '3'|| row.status == '9') && row.detail.feel == '0'; } }, @@ -230,7 +230,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde }, visible: function (row) { //非免费订单只有未支付可取消 - if((row.status == '2'|| row.status == '3' )&& row.detail.feel == '0'){ + if(row.detail.status == '2' && (row.status == '2'|| row.status == '3' )&& row.detail.feel == '0'){ return true; } diff --git a/public/assets/js/manystore/school/activity/activity.js b/public/assets/js/manystore/school/activity/activity.js index 1edc593..5ec23b6 100644 --- a/public/assets/js/manystore/school/activity/activity.js +++ b/public/assets/js/manystore/school/activity/activity.js @@ -65,10 +65,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'address_detail', title: __('Address_detail'), operate: 'LIKE'}, {field: 'longitude', title: __('Longitude'), operate: 'LIKE'}, {field: 'latitude', title: __('Latitude'), operate: 'LIKE'}, - {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'sign_start_time', title: __('Sign_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'sign_end_time', title: __('Sign_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + + + {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + + + {field: 'price', title: __('Price'), operate:'BETWEEN'}, {field: 'stock', title: __('Stock')}, diff --git a/public/assets/js/manystore/school/activity/order/order.js b/public/assets/js/manystore/school/activity/order/order.js index 75f8673..11e629a 100644 --- a/public/assets/js/manystore/school/activity/order/order.js +++ b/public/assets/js/manystore/school/activity/order/order.js @@ -193,7 +193,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde }, visible: function (row) { //非免费订单只有未支付可取消 - if((row.status == '2'|| row.status == '3' )&& row.schoolactivityorderdetail.feel == '0'){ + if(row.schoolactivityorderdetail.status == '2' && (row.status == '2'|| row.status == '3' )&& row.schoolactivityorderdetail.feel == '0'){ return true; }