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