|
|
@@ -225,7 +225,7 @@ class WholeController extends Curd
|
|
|
},
|
|
|
'memberInfo',
|
|
|
'cert',
|
|
|
- 'skus' => function ($query) {
|
|
|
+ 'sku' => function ($query) {
|
|
|
$query->where('goods_sku_status', 'ON')
|
|
|
->select('goods_sku_id', 'join_sku_goods_id', 'goods_sku_specs_json', 'goods_sku_sales_price');
|
|
|
},
|
|
|
@@ -278,23 +278,19 @@ class WholeController extends Curd
|
|
|
|
|
|
$item['goods']['components'] = $goodsArr;
|
|
|
}
|
|
|
- if (!empty($item['skus'])) {
|
|
|
- foreach ($item['skus'] as $k => $sku) {
|
|
|
- if (!empty($sku['goods_sku_specs_json'])) {
|
|
|
- $specsJson = json_decode($sku['goods_sku_specs_json'], true);
|
|
|
- $skuName = '';
|
|
|
- foreach ($specsJson as $specsKey => $skuSpecs) {
|
|
|
- if (is_array($skuSpecs)) {
|
|
|
- $skuName = $skuName . ' ' . implode(' ', $skuSpecs) . ';';
|
|
|
- } else {
|
|
|
- $skuName = $skuName . ' ' . $skuSpecs . ';';
|
|
|
- }
|
|
|
+ if (!empty($item['sku'])) {
|
|
|
+ if (!empty($item['sku']['goods_sku_specs_json'])) {
|
|
|
+ $specsJson = json_decode($item['sku']['goods_sku_specs_json'], true);
|
|
|
+ $skuName = '';
|
|
|
+ foreach ($specsJson as $specsKey => $skuSpecs) {
|
|
|
+ if (is_array($skuSpecs)) {
|
|
|
+ $skuName = $skuName . ' ' . implode(' ', $skuSpecs) . ';';
|
|
|
+ } else {
|
|
|
+ $skuName = $skuName . ' ' . $skuSpecs . ';';
|
|
|
}
|
|
|
- $item['skus'][$k]['goods_sku_title'] = rtrim($skuName, ';');
|
|
|
}
|
|
|
-
|
|
|
+ $item['sku']['goods_sku_title'] = rtrim($skuName, ';');
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
if (in_array($item['goods']['goods_classify'],['SERVICE','CHNMED','CHNNCD','PACKAGE'])) {
|
|
|
$benifits = MemberBenefit::where('join_benefit_member_id', $item['join_sheet_member_id'])
|
gorden