Compare commits

..

No commits in common. "a7446dc23223dde0e8a438cd1939ce6ef9a29045" and "547755157d4679fc0f121b413399883d3961d0d8" have entirely different histories.

3 changed files with 2 additions and 20 deletions

View File

@ -731,7 +731,7 @@ class AdminController extends PublicController
$paidOrderList = $orderDb
->alias('o') // 别名为 o
->join('lr_receive_site rs ON o.receive_site_id = rs.id') // 关联 lr_receive_site 表
->field('o.id,o.shop_id,o.order_sn,o.food_sn,o.total_weight,o.total_num,o.total_price,o.apply_price,o.receiver,o.tel,o.by_plane_id,o.receive_site_id,o.receive_site_name,o.remark,o.product_snapshot,o.main_status,o.shipment_status,o.refund_status,o.refund_remark,o.order_time,o.paid_time,o.refundapply_time,o.received_time,o.shipped_time, rs.bind_route, rs.runing') // 选择字段,包括 bind_route 和 runing
->field('o.id,o.shop_id,o.order_sn,o.food_sn,o.total_weight,o.total_num,o.total_price,o.apply_price,o.receiver,o.tel,o.by_plane_id,o.receive_site_id,o.receive_site_name,o.remark,o.product_snapshot,o.main_status,o.shipment_status,o.refund_status,o.refund_remark,o.order_time,o.refundapply_time,o.received_time,o.shipped_time, rs.bind_route, rs.runing') // 选择字段,包括 bind_route 和 runing
->where($where)
->select();

View File

@ -120,7 +120,7 @@ class PayController extends PublicController
$where['order_sn'] = $result['resource']['ciphertext']['out_trade_no']; // 获取订单号
$orderDb = D('order'); // 实例化订单模型
$data['main_status'] = "已退款"; // 更新订单状态为已退款
$data['refunded_time'] = time(); // 标记退款时间
$data['refund_time'] = time(); // 标记退款时间
$data['refund_sn'] = $result['resource']['ciphertext']['refund_id']; // 退款单号
$data['refund_price'] = $result['resource']['ciphertext']['amount']['refund'] / 100; // 退款金额,单位:元
$outRefundNo = $result['resource']['ciphertext']['out_refund_no'];

View File

@ -592,14 +592,6 @@ class PlaneController extends PublicController
}
if ($_REQUEST['shipment_status']) {
$data['shipment_status'] = htmlspecialchars($_REQUEST['shipment_status']);
switch ($data['shipment_status']) {
case '已发货':
$data['shipped_time'] = time();
break;
case '已送达':
$data['delivered_time'] = time();
break;
}
}
if ($_REQUEST['refund_status']) {
$data['refund_status'] = htmlspecialchars($_REQUEST['refund_status']);
@ -656,19 +648,9 @@ class PlaneController extends PublicController
}
if ($_REQUEST['shipment_status']) {
$data['shipment_status'] = htmlspecialchars($_REQUEST['shipment_status']);
switch ($data['shipment_status']) {
case '已接单':
$data['received_time'] = time();
break;
}
}
if ($_REQUEST['refund_status']) {
$data['refund_status'] = htmlspecialchars($_REQUEST['refund_status']);
switch ($data['refund_status']) {
case '拒绝退':
$data['rejected_time'] = time();
break;
}
}
if ($_REQUEST['by_plane_id']) {
$data['by_plane_id'] = ($_REQUEST['by_plane_id'] == 'null') ? null : intval($_REQUEST['by_plane_id']);