Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/services/marketing/MarketingGoodsService.php

@@ -99,6 +99,10 @@ class MarketingGoodsService
         $list = [];
         $i = 0;
         foreach ($data as $key => $value) {
+
+            $inventoryRest = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
+            if (!empty($inventoryRest)) {
+                $list[$i]['inventory_rest'] = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
                 $list[$i] = $value;
                 $list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : '';
                 
@@ -120,6 +124,7 @@ class MarketingGoodsService
 
                 $list[$i]['shop_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['shop_id']) ? $goodsSkuList[$value['goods_sku_id']]['shop_id'] : '';
                 $list[$i]['goods_name'] = !empty($goodsSkuList[$value['goods_sku_id']]['goods_name']) ? $goodsSkuList[$value['goods_sku_id']]['goods_name'] : '';
+                
                 $list[$i]['goods_desc'] = !empty($goodsSkuList[$value['goods_sku_id']]['desc']) ? $goodsSkuList[$value['goods_sku_id']]['desc'] : '';
                 $list[$i]['goods_spu_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['goods_spu_id']) ? $goodsSkuList[$value['goods_sku_id']]['goods_spu_id'] : '';
                 $list[$i]['original_price'] = !empty($goodsSkuList[$value['goods_sku_id']]['original_price']) ? $goodsSkuList[$value['goods_sku_id']]['original_price']/100 : '';
@@ -148,6 +153,7 @@ class MarketingGoodsService
                 $content = $userId .'_' .$value['marketing_id'];
                 $goodsShareId = Aes::encrypt($content);
                 $list[$i]['goods_share_code'] = $goodsShareId;
+            }
 
             $i++;
         }

application/services/shop/ShopService.php

@@ -99,6 +99,11 @@ class ShopService
         $address = !empty($params['address']) ? $params['address'] : '';
         $subShopId = !empty($params['sub_shop_id']) ? $params['sub_shop_id'] : '';
 
+
+        if (empty($lifeAccountId)) {
+             throw new ShopException(['cus' => 0]);
+        }
+
         if (!empty($subShopId)) {
             $where['sub_shop_id'] =  $subShopId;
         }