|
@@ -42,7 +42,7 @@ class GreatLifeOrderIndependentAccount extends Command
|
|
42
|
$merchants = [];
|
42
|
$merchants = [];
|
|
43
|
|
43
|
|
|
44
|
// 已支付、未结算
|
44
|
// 已支付、未结算
|
|
45
|
- $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0, 'is_settlement' => 1];
|
|
|
|
|
|
45
|
+ $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0];
|
|
46
|
// 订单状态(0:待发货;1:待收货;2:待评价;3:已完成;4已申请退款;-1:已退款)5未支付 6已取消'
|
46
|
// 订单状态(0:待发货;1:待收货;2:待评价;3:已完成;4已申请退款;-1:已退款)5未支付 6已取消'
|
|
47
|
$status = [2, 3];
|
47
|
$status = [2, 3];
|
|
48
|
// 普通订单
|
48
|
// 普通订单
|