|
|
@@ -21,7 +21,7 @@ class RefundOrderClass extends BaseClass
|
|
|
const STATUS_COMPLETE = 1; //已完成
|
|
|
|
|
|
const REFUND_TYPE_MONEY_GOOD = 1; //退款退货
|
|
|
- const REFUND_TYPE_MONEY= 2; // 仅退款
|
|
|
+ const REFUND_TYPE_MONEY = 2; // 仅退款
|
|
|
|
|
|
|
|
|
// 订单列表
|
|
|
@@ -39,7 +39,7 @@ class RefundOrderClass extends BaseClass
|
|
|
|
|
|
|
|
|
//2021.1.23 linqh 订单详情
|
|
|
- public static function getOrderDetail($orderSn,$shopId)
|
|
|
+ public static function getOrderDetail($orderSn, $shopId)
|
|
|
{
|
|
|
$orderData = self::orderExist(['orderSn' => $orderSn, 'shopId' => $shopId]);
|
|
|
$orderInfo = RefundOrderItemClass::getOrderItemDetail($orderSn);
|
|
|
@@ -119,7 +119,7 @@ class RefundOrderClass extends BaseClass
|
|
|
}
|
|
|
|
|
|
//2021.1.23 linqh 订单详情
|
|
|
- public static function getOrderDetailByRelateOrder($orderSn,$shopId)
|
|
|
+ public static function getOrderDetailByRelateOrder($orderSn, $shopId)
|
|
|
{
|
|
|
$orderData = self::orderExist(['relateOrderSn' => $orderSn, 'shopId' => $shopId]);
|
|
|
$orderInfo = RefundOrderItemClass::getOrderItemDetail($orderData['orderSn']);
|
|
|
@@ -138,13 +138,10 @@ class RefundOrderClass extends BaseClass
|
|
|
$itemData[] = $tmp;
|
|
|
}
|
|
|
}
|
|
|
- //下面注释放开前,员工id要用shopAdminId
|
|
|
- //$orderData = self::groupAdmin($orderData);
|
|
|
$orderData['itemInfo'] = $itemData;
|
|
|
- //订单总金额
|
|
|
$kdOrder = OrderClass::getByOrderSn($orderSn);
|
|
|
- $orderData['totalPrice'] = $kdOrder['realPrice'];
|
|
|
-
|
|
|
+ $orderData['orderInfo'] = $kdOrder;
|
|
|
return $orderData;
|
|
|
}
|
|
|
+
|
|
|
}
|