|
|
@@ -118,7 +118,7 @@ class RefundOrderClass extends BaseClass
|
|
|
{
|
|
|
$orderData = self::getByCondition($where);
|
|
|
if (!$orderData) {
|
|
|
- util::fail('订单不存在或不能取消');
|
|
|
+ util::fail('订单不存在');
|
|
|
}
|
|
|
return $orderData;
|
|
|
}
|
|
|
@@ -165,4 +165,29 @@ class RefundOrderClass extends BaseClass
|
|
|
return $batchData;
|
|
|
}
|
|
|
|
|
|
+ //2021.1.23 linqh 订单详情
|
|
|
+ public static function getOrderDetailByRelateOrder($orderSn,$shopId)
|
|
|
+ {
|
|
|
+ $orderData = self::orderExist(['relateOrderSn' => $orderSn, 'shopId' => $shopId]);
|
|
|
+ $orderInfo = RefundOrderItemClass::getOrderItemDetail($orderData['orderSn']);
|
|
|
+ $itemData = [];
|
|
|
+ if ($orderInfo) {
|
|
|
+ foreach ($orderInfo as $v) {
|
|
|
+ $info = json_decode($v['itemInfo'], true);
|
|
|
+ $tmp = $info;
|
|
|
+ $tmp['itemCover'] = self::groupImg($info['itemCover']);
|
|
|
+ unset($v['itemInfo']);
|
|
|
+ //兼容 旧数据,没有 rank (花材等级 默认给B)
|
|
|
+ if (!isset($tmp['rank'])) {
|
|
|
+ $tmp['rank'] = 'B';
|
|
|
+ }
|
|
|
+ $tmp = array_merge($tmp, $v);
|
|
|
+ $itemData[] = $tmp;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //下面注释放开前,员工id要用shopAdminId
|
|
|
+ //$orderData = self::groupAdmin($orderData);
|
|
|
+ $orderData['itemInfo'] = $itemData;
|
|
|
+ return $orderData;
|
|
|
+ }
|
|
|
}
|