|
@@ -230,6 +230,7 @@ class WholeController extends Curd
|
|
|
$query->where('goods_sku_status', 'ON')
|
|
|
->select('goods_sku_id', 'join_sku_goods_id', 'goods_sku_specs_json', 'goods_sku_sales_price');
|
|
|
},
|
|
|
+ 'skus',
|
|
|
'refund' => function ($query) {
|
|
|
$query->select('join_return_order_id', 'order_return_status');
|
|
|
}
|
|
@@ -293,6 +294,26 @@ class WholeController extends Curd
|
|
|
$item['sku']['goods_sku_title'] = rtrim($skuName, ';');
|
|
|
}
|
|
|
}
|
|
|
+ if (!empty($item['skus'])) {
|
|
|
+ foreach ($item['skus'] as $key => $skus) {
|
|
|
+ if (!empty($skus['goods_sku_specs_json'])) {
|
|
|
+ $item['skus'][$key]['goods_sku_specs_json'] = json_decode($skus['goods_sku_specs_json']);
|
|
|
+
|
|
|
+ $skuName = '';
|
|
|
+ foreach ($item['skus'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
|
|
|
+ $keyStr = ($specsKey == '规格') ? '' : ($specsKey.':');
|
|
|
+ if (is_array($skuSpecs)) {
|
|
|
+ $skuName = $skuName .$keyStr . ' ' . implode(' ', $skuSpecs) . '; ';
|
|
|
+ } else {
|
|
|
+ $skuName = $skuName .$keyStr . ' ' . $skuSpecs . '; ';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $item['skus'][$key]['sku_name'] = rtrim($skuName,'; ');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $item['skus'] = [];
|
|
|
+ }
|
|
|
if (in_array($item['goods']['goods_classify'],['SERVICE','CHNMED','CHNNCD','PACKAGE'])) {
|
|
|
$benifits = MemberBenefit::where('join_benefit_member_id', $item['join_sheet_member_id'])
|
|
|
->where('join_benefit_order_id', $orderId)
|