|
|
@@ -1219,8 +1219,10 @@ class Expedite extends Base
|
|
|
// ->where('refund_state','in','0,1,2')
|
|
|
// ->count();
|
|
|
$finish_num = 0;
|
|
|
- $refund_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'cancel_state'=>0])
|
|
|
- ->where('refund_state','in','1')
|
|
|
+ $refund_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'cancel_state'=>0])->alias('o')
|
|
|
+ ->leftJoin('StoreOrderRefund r','r.order_id = o.id')
|
|
|
+ ->where('o.refund_state','in','1,2,3')
|
|
|
+ ->where('r.status','in','0,1,2,4')
|
|
|
->count();
|
|
|
$mark_num = $trolley_num + $no_pay_num + $no_express_num + $express_num + $finish_num + $finish_num + $refund_num;
|
|
|
//招聘
|
