|
@@ -26,7 +26,7 @@ class OrderService
|
|
|
*/
|
|
|
public static function getOrderList(array $param, $isAll = false)
|
|
|
{
|
|
|
- $list = self::getOrderQuerySql($param)->select("orders.*", 'pay_merchants.name as pay_merchant_name', 'pay_merchants.payee_name', 'pay_merchants.pay_appid', 'miniprogram.play_name', "miniprogram.name as xcx_name", 'promotions.name as promotion_title')->orderBy("orders.id", 'desc');
|
|
|
+ $list = self::getOrderQuerySql($param)->select("orders.*",'orders_refund_verify.id as refund_id', 'pay_merchants.name as pay_merchant_name', 'pay_merchants.payee_name', 'pay_merchants.pay_appid', 'miniprogram.play_name', "miniprogram.name as xcx_name", 'promotions.name as promotion_title')->orderBy("orders.id", 'desc');
|
|
|
|
|
|
if ($isAll) {
|
|
|
$list = $list->get();
|
|
@@ -56,7 +56,9 @@ class OrderService
|
|
|
$val->promotion_title = $val->promotion_title ?: '-';
|
|
|
$val->tip_text = $types[$val->order_type]['name'] ?? "-";
|
|
|
$val->status_txt = $status[$val->status]['name'] ?? "-";
|
|
|
+ $val->can_apply = $val->refund_id < 1 && $val->status == 'PAID';
|
|
|
$val->pay_name = '微信支付';
|
|
|
+ unset($val->refund_id);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -98,7 +100,7 @@ class OrderService
|
|
|
|
|
|
private static function getOrderQuerySql(array $param)
|
|
|
{
|
|
|
- $sql = DB::table('orders')->leftJoin('miniprogram', 'miniprogram.id', '=', 'orders.miniprogram_id')->leftJoin('promotions', 'promotions.id', '=', 'orders.promotion_id')->leftJoin('pay_merchants', 'pay_merchants.id', '=', 'orders.pay_merchant_id');
|
|
|
+ $sql = DB::table('orders')->leftJoin('orders_refund_verify','orders.id','=','orders_refund_verify.order_id')->leftJoin('miniprogram', 'miniprogram.id', '=', 'orders.miniprogram_id')->leftJoin('promotions', 'promotions.id', '=', 'orders.promotion_id')->leftJoin('pay_merchants', 'pay_merchants.id', '=', 'orders.pay_merchant_id');
|
|
|
// 优化师查询
|
|
|
if (!empty(getProp($param, 'user_id'))) {
|
|
|
$sql->where('orders.user_id', $param['user_id']);
|