修改信用购订单的错误
This commit is contained in:
parent
11345e97bd
commit
cbf99b8139
@ -48,7 +48,7 @@ class StoreGroupOrderDao extends BaseDao
|
|||||||
$storeOrderWhere = StoreOrder::where('activity_type', $productType);
|
$storeOrderWhere = StoreOrder::where('activity_type', $productType);
|
||||||
return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)->when($uid, function ($query, $uid) {
|
return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)->when($uid, function ($query, $uid) {
|
||||||
$query->where('StoreGroupOrder.uid', $uid);
|
$query->where('StoreGroupOrder.uid', $uid);
|
||||||
})->where('StoreGroupOrder.is_del', 0)->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)")->count();
|
})->where('StoreGroupOrder.is_del', 0)->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)")->count();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -70,7 +70,7 @@ class StoreGroupOrderRepository extends BaseRepository
|
|||||||
}
|
}
|
||||||
$query->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
|
$query->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
|
||||||
if ($where['paid'] == 0) {
|
if ($where['paid'] == 0) {
|
||||||
$query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)");
|
$query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)");
|
||||||
} else {
|
} else {
|
||||||
$query->where('StoreGroupOrder.paid', $where['paid']);
|
$query->where('StoreGroupOrder.paid', $where['paid']);
|
||||||
}
|
}
|
||||||
@ -128,14 +128,11 @@ class StoreGroupOrderRepository extends BaseRepository
|
|||||||
if (empty($order)) {
|
if (empty($order)) {
|
||||||
throw new DataNotFoundException('订单不存在或已取消');
|
throw new DataNotFoundException('订单不存在或已取消');
|
||||||
}
|
}
|
||||||
$return = $order->toArray();
|
|
||||||
if (!empty($order->interest)) {
|
if (!empty($order->interest)) {
|
||||||
$interest = $order->interest->calculateInterest();
|
$interest = $order->interest->calculateInterest();
|
||||||
$return['interest']['total_amount'] = bcadd($order->interest->total_price, $interest, 2);
|
$order->interest->total_amount = bcadd($order->interest->total_price, $interest, 2);
|
||||||
} else {
|
|
||||||
$return['interest']['total_amount'] = $order['total_price'];
|
|
||||||
}
|
}
|
||||||
return $return;
|
return $order;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function status($uid, $id)
|
public function status($uid, $id)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user