|
|
@@ -69,6 +69,9 @@ class User extends Api
|
|
|
$where = [];
|
|
|
$typeId = $this->request->post('type_id/d', 0);
|
|
|
switch ($typeId) {
|
|
|
+ case 0:
|
|
|
+ $where['a.status'] = ['<' , $productOrder::Shipped];
|
|
|
+ break;
|
|
|
case 1:
|
|
|
$where = ['a.type_id' => $productOrder::Transfer, 'a.status' => $productOrder::Transferred];
|
|
|
break;
|
|
|
@@ -91,7 +94,8 @@ class User extends Api
|
|
|
->join("product_transfer z", "a.id = z.order_id AND a.status=2", "left") //转让
|
|
|
->join("product_area d", "d.id = a.area_id", "left") //地区
|
|
|
->field('a.id as order_id,a.product_id,'.'b.'.$this->lan.'_name as name,b.thum as img_url,a.price,a.status,a.type_id,c.'.$this->lan.'_title as title,z.price as transfer_price,d.address')
|
|
|
- ->where('a.user_id', $this->auth->id)->where($where)
|
|
|
+ //->where('a.user_id', $this->auth->id)
|
|
|
+ ->where($where)
|
|
|
->order('a.id DESC')
|
|
|
->paginate($this->pageSize);
|
|
|
$this->success('', $list);
|
afa