|
@@ -5,6 +5,8 @@ namespace app\admin\controller\member;
|
|
|
use app\admin\validate\member\RuleAddedValidate;
|
|
|
use app\admin\validate\member\RulePricingValidate;
|
|
|
use app\controller\Curd;
|
|
|
+use app\model\Coupon;
|
|
|
+use app\model\GoodsSku;
|
|
|
use app\model\RuleAdded;
|
|
|
use app\model\RuleAddedComponent;
|
|
|
use app\model\RulePricing;
|
|
@@ -34,20 +36,48 @@ class RuleAddedComponentController extends Curd
|
|
|
protected function afterQuery($items)
|
|
|
{
|
|
|
foreach ($items as &$item) {
|
|
|
+ $goods = [];
|
|
|
$goodsIds = [];
|
|
|
if (!empty($item->rule_added_component_goods_json)) {
|
|
|
$goodsJson = json_decode($item->rule_added_component_goods_json, true);
|
|
|
foreach ($goodsJson as $item2) {
|
|
|
+ $goodsInfo = [];
|
|
|
if (isset($item2['goods_id'])) {
|
|
|
- $goodsIds[] = $item2['goods_id'];
|
|
|
- }elseif (isset($item2['coupon_id'])){
|
|
|
- $goodsIds[] = $item2['coupon_id'];
|
|
|
+ $goodsInfo['goods_name'] = $item2['goods_name'];
|
|
|
+ $sku = GoodsSku::where('goods_sku_id', $item2['goods_sku_id'])->select('goods_sku_specs_json')->first();
|
|
|
+ if (!empty($sku->goods_sku_specs_json)) {
|
|
|
+ $specsJson = json_decode($sku->goods_sku_specs_json, true);
|
|
|
+ $skuTitle = '';
|
|
|
+ foreach ($specsJson as $item3) {
|
|
|
+ if (is_array($item3)) {
|
|
|
+ $item3 = implode(',', $item3);
|
|
|
+ }
|
|
|
+ $skuTitle .= $item3 . '-';
|
|
|
+ }
|
|
|
+ $goodsInfo['sku_title'] = rtrim($skuTitle, '-');
|
|
|
+ }
|
|
|
}
|
|
|
+ if (isset($item2['coupon_id'])){
|
|
|
+ $coupon = Coupon::where('coupon_id',$item2['coupon_id'])->select('coupon_name')->first();
|
|
|
+ $goods[] = ['goods_name'=>$coupon->coupon_name];
|
|
|
+ }
|
|
|
+ if (!empty($goodsInfo)) {
|
|
|
+ $goods[] = $goodsInfo;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+// if (isset($item2['goods_id'])) {
|
|
|
+// $goodsIds[] = $item2['goods_id'];
|
|
|
+// }elseif (isset($item2['coupon_id'])){
|
|
|
+// $goodsIds[] = $item2['coupon_id'];
|
|
|
+// }
|
|
|
}
|
|
|
$item->rule_added_component_goods_json = $goodsJson;
|
|
|
}
|
|
|
$item->rule_added_component_goods_nbr = intval($item->rule_added_component_goods_nbr);
|
|
|
- $item->goodsIds = $goodsIds;
|
|
|
+// $item->goodsIds = $goodsIds;
|
|
|
+ $item->goods = $goods;
|
|
|
}
|
|
|
|
|
|
return $items;
|