jiaoyukun/NewDiverseYouthNightSchool
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.1: ­­退款原因不显示，只显示admin：后端退款未传退款原因，已传入退款原因

Browse Source 
4.2：自己发布的活动，自己能报名：与静娴商议决定保留，因为可能存在替他人报名的情况（录入人员信息）
     4.3：后台管理，过了活动开始时间的订单不该再显示取消按钮，只显示申请售后按钮
This commit is contained in:
qinzexin 2025-06-23 17:35:59 +08:00
parent 6026f3a50e
commit 45bd66c005
7 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/school/activity/order/Order.php
View File

@ -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());

2
application/common/model/school/activity/order/Order.php
View File

@ -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);

2
application/manystore/controller/school/activity/order/Order.php
View File

@ -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']);
}

13
public/assets/js/backend/school/activity/activity.js
View File

@ -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')},

6
public/assets/js/backend/school/activity/order/order.js
View File

@ -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;
}

10
public/assets/js/manystore/school/activity/activity.js
View File

@ -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')},

2
public/assets/js/manystore/school/activity/order/order.js
View File

@ -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;
}