Compare commits

..

No commits in common. "e830e70353c721dbb4b85456eb0051addd527386" and "d879dfe948e4305886d82a75ab1c0b3c32b01b7d" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -728,7 +728,7 @@ class AdminController extends PublicController
$paidOrderList = $orderDb $paidOrderList = $orderDb
->alias('o') // 别名为 o ->alias('o') // 别名为 o
->join('lr_receive_site rs ON o.receive_site_id = rs.id') // 关联 lr_receive_site 表 ->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.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, 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.receiver,o.tel,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, rs.bind_route, rs.runing') // 选择字段,包括 bind_route 和 runing
->where($where) ->where($where)
->select(); ->select();

View File

@ -82,7 +82,7 @@ class PayController extends PublicController
exit(); exit();
} }
if ($order['main_status'] == "已完成") { if ($order['main_status'] == "已完成") {
echo json_encode(array('status' => 0, 'msg' => '已完成订单不可申请退款')); echo json_encode(array('status' => 1, 'msg' => '已完成订单不可申请退款'));
exit(); exit();
} }