|
@@ -129,6 +129,14 @@ class Litestoreorder extends Model |
|
@@ -129,6 +129,14 @@ class Litestoreorder extends Model |
|
129
|
$item['sku_image'] = $item['spec']['spec_image']=='' ? '' : cdnurl($item['spec']['spec_image'], true);
|
129
|
$item['sku_image'] = $item['spec']['spec_image']=='' ? '' : cdnurl($item['spec']['spec_image'], true);
|
|
130
|
$goodsList[] = $item;
|
130
|
$goodsList[] = $item;
|
|
131
|
}
|
131
|
}
|
|
|
|
132
|
+ // 判断状态
|
|
|
|
133
|
+ if($v['pay_status'] == '10' && $v['order_status'] == '10') {
|
|
|
|
134
|
+ $v['status'] = 1;
|
|
|
|
135
|
+ } elseif($v['pay_status'] == '20' && $v['order_status'] == '10') {
|
|
|
|
136
|
+ $v['status'] = 2;
|
|
|
|
137
|
+ } elseif($v['pay_status'] == '20' && $v['order_status'] == '30') {
|
|
|
|
138
|
+ $v['status'] = 3;
|
|
|
|
139
|
+ }
|
|
132
|
$v['goods'] = $goodsList;
|
140
|
$v['goods'] = $goodsList;
|
|
133
|
}
|
141
|
}
|
|
134
|
return $list;
|
142
|
return $list;
|
|
@@ -142,6 +150,14 @@ class Litestoreorder extends Model |
|
@@ -142,6 +150,14 @@ class Litestoreorder extends Model |
|
142
|
], ['goods'=>['spec','goods']])) {
|
150
|
], ['goods'=>['spec','goods']])) {
|
|
143
|
throw new BaseException(['msg' => '订单不存在']);
|
151
|
throw new BaseException(['msg' => '订单不存在']);
|
|
144
|
}
|
152
|
}
|
|
|
|
153
|
+ // 判断状态
|
|
|
|
154
|
+ if($order['pay_status'] == '10' && $order['order_status'] == '10') {
|
|
|
|
155
|
+ $order['status'] = 1;
|
|
|
|
156
|
+ } elseif($order['pay_status'] == '20' && $order['order_status'] == '10') {
|
|
|
|
157
|
+ $order['status'] = 2;
|
|
|
|
158
|
+ } elseif($order['pay_status'] == '20' && $order['order_status'] == '30') {
|
|
|
|
159
|
+ $order['status'] = 3;
|
|
|
|
160
|
+ }
|
|
145
|
$goodsList = [];
|
161
|
$goodsList = [];
|
|
146
|
foreach ($order['goods'] as $index => $item) {
|
162
|
foreach ($order['goods'] as $index => $item) {
|
|
147
|
$item['image'] = cdnurl(explode(",",$item['images'])[0], true);
|
163
|
$item['image'] = cdnurl(explode(",",$item['images'])[0], true);
|
