companyProjecet.git

			@@ -13,7 +13,7 @@
			use app\api\model\user\CardRecord as CardRecordModel; // 会员卡 by lyzflash
			use app\common\model\plus\advance\Product as AdvanceProductModel;
			use app\supplier\model\product\ProductSku;

			use app\api\model\order\Cart as CartModel;
			/**
			* 商品模型
			*/
			@@ -163,8 +163,17 @@
			private function setProductListDataFromApi(&$data, $isMultiple, $param)
			{
			return parent::setProductListData($data, $isMultiple, function ($product) use ($param) {
			if(!empty($param['userInfo'])){
			$CartModel=new CartModel();
			$product['cart']=$CartModel->getCartCount($param['userInfo']['user_id'],$product['product_id']);
			}else{
			$product['cart']=['total_num'=>0];
			}
			// 计算并设置商品会员价
			$this->setProductGradeMoney($param['userInfo'], $product);
			if ($product['is_price_negotiable']) {
			$product['product_price'] = '价格面议';
			}
			});
			}

			@@ -309,6 +318,7 @@
			}
			}
			$data['content'] = isset($data['content']) ? $data['content'] : '';
			$data['open_coupons'] = isset($data['open_coupons']) ? $data['open_coupons'] : [];
			$data['app_id'] = $data['sku']['app_id'] = self::$app_id;

			$this->processContent($data);
			@@ -380,7 +390,7 @@
			/**
			* 编辑商品
			*/
			public function edit($data,$shop_supplier_id)
			public function edit($data)
			{
			if (!isset($data['image']) \|\| empty($data['image'])) {
			$this->error = '请上传商品图片';
			@@ -402,6 +412,7 @@
			}
			$data['spec_type'] = isset($data['spec_type']) ? $data['spec_type'] : $this['spec_type'];
			$data['content'] = isset($data['content']) ? $data['content'] : '';
			$data['open_coupons'] = isset($data['open_coupons']) ? $data['open_coupons'] : [];
			$data['app_id'] = $data['sku']['app_id'] = self::$app_id;
			$productSkuIdList = helper::getArrayColumn(($this['sku']), 'product_sku_id');
			return $this->transaction(function () use ($data, $productSkuIdList) {