Compare commits

..

2 Commits

Author SHA1 Message Date
tk
a7446dc232 【类 型】:fix 在处理订单表时 给对应操的时间字段 加上时间
【原  因】:
【过  程】:1.已发货 已送达 已接单 拒绝退 2.获取订单列表时field 加上付款时间字段
【影  响】:
2024-08-07 12:52:18 +08:00
tk
f1f5b8a6bc 【类 型】:fix 完成退款时间字段名 由refund_time 改为refunded_time
【原  因】:数据库添加多个 订单状态时间 字段改名
【过  程】:
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
2024-08-07 12:38:34 +08:00
3 changed files with 20 additions and 2 deletions

View File

@ -731,7 +731,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.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 ->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
->where($where) ->where($where)
->select(); ->select();

View File

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

View File

@ -592,6 +592,14 @@ class PlaneController extends PublicController
} }
if ($_REQUEST['shipment_status']) { if ($_REQUEST['shipment_status']) {
$data['shipment_status'] = htmlspecialchars($_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']) { if ($_REQUEST['refund_status']) {
$data['refund_status'] = htmlspecialchars($_REQUEST['refund_status']); $data['refund_status'] = htmlspecialchars($_REQUEST['refund_status']);
@ -648,9 +656,19 @@ class PlaneController extends PublicController
} }
if ($_REQUEST['shipment_status']) { if ($_REQUEST['shipment_status']) {
$data['shipment_status'] = htmlspecialchars($_REQUEST['shipment_status']); $data['shipment_status'] = htmlspecialchars($_REQUEST['shipment_status']);
switch ($data['shipment_status']) {
case '已接单':
$data['received_time'] = time();
break;
}
} }
if ($_REQUEST['refund_status']) { if ($_REQUEST['refund_status']) {
$data['refund_status'] = htmlspecialchars($_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']) { if ($_REQUEST['by_plane_id']) {
$data['by_plane_id'] = ($_REQUEST['by_plane_id'] == 'null') ? null : intval($_REQUEST['by_plane_id']); $data['by_plane_id'] = ($_REQUEST['by_plane_id'] == 'null') ? null : intval($_REQUEST['by_plane_id']);