作者 耿培杰

修改订单详情接口

@@ -5,6 +5,7 @@ namespace app\api\controller; @@ -5,6 +5,7 @@ namespace app\api\controller;
5 use addons\kdniao\library\Kdniao; 5 use addons\kdniao\library\Kdniao;
6 use app\api\model\AreaExtend; 6 use app\api\model\AreaExtend;
7 use app\api\model\OrderDetail; 7 use app\api\model\OrderDetail;
  8 +use app\api\model\OrderRefund;
8 use app\api\model\UserScoreLog; 9 use app\api\model\UserScoreLog;
9 use app\common\controller\Api; 10 use app\common\controller\Api;
10 use think\Db; 11 use think\Db;
@@ -1343,7 +1344,7 @@ class Order extends Api @@ -1343,7 +1344,7 @@ class Order extends Api
1343 $order['ticketcode'] = ''; 1344 $order['ticketcode'] = '';
1344 } 1345 }
1345 $detailInfo = $this->orderDetailModel->where('id', $param['order_detail_id'])->field('shipper_code,logistic_code,status')->find(); 1346 $detailInfo = $this->orderDetailModel->where('id', $param['order_detail_id'])->field('shipper_code,logistic_code,status')->find();
1346 - if (!empty($order['team_group_status'] && $order['team_group_status'] == 1)) { 1347 + if (!empty($order['team_group_status'] && $order['team_group_status'] == 1 && $order['status'] == 1)) {
1347 $order['status'] = '6'; 1348 $order['status'] = '6';
1348 $order['status_text'] = '待成团'; 1349 $order['status_text'] = '待成团';
1349 } elseif (!empty($order['team_group_status'] && $order['team_group_status'] == 2 && $detailInfo['status'] == 2)) { 1350 } elseif (!empty($order['team_group_status'] && $order['team_group_status'] == 2 && $detailInfo['status'] == 2)) {
@@ -1358,9 +1359,14 @@ class Order extends Api @@ -1358,9 +1359,14 @@ class Order extends Api
1358 } elseif ($order['status'] == 3) { 1359 } elseif ($order['status'] == 3) {
1359 $order['status'] = '8'; 1360 $order['status'] = '8';
1360 $order['status_text'] = '已退款'; 1361 $order['status_text'] = '已退款';
1361 - $order['refund_time'] = '2020-01-01 08:33:23';  
1362 - $order['refund_remark'] = '退款至微信钱包';  
1363 - $order['refund_price'] = '8888'; 1362 + $orderRefundModel = new OrderRefund();
  1363 + $orderRefundInfo = $orderRefundModel->where('order_num',$order['order_num'])->find();
  1364 + if ($orderRefundInfo){
  1365 + $order['refund_time'] = date('Y-m-d H:i:s',$orderRefundInfo['createtime']);
  1366 + if ($orderRefundInfo['type'] == 1) $order['refund_remark'] = '退款至余额钱包';
  1367 + else $order['refund_remark'] = '退款至微信钱包';
  1368 + $order['refund_price'] = $orderRefundInfo['total'];
  1369 + }
1364 1370
1365 } 1371 }
1366 1372