From 427c368602e138d963fbff532fe16c130cf65603 Mon Sep 17 00:00:00 2001 From: lqmac Date: Sun, 3 Mar 2024 14:52:25 +0800 Subject: [PATCH] 1 --- app/api/controller/Store.php | 3 +++ app/api/model/Goods.php | 17 ++++++++++------- app/api/service/Goods.php | 21 ++++++++++++++------- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/app/api/controller/Store.php b/app/api/controller/Store.php index 4ea19fc0..b0ceb354 100644 --- a/app/api/controller/Store.php +++ b/app/api/controller/Store.php @@ -114,6 +114,9 @@ class Store extends Controller $info = StoreInfoModel::where('store_id',$storeid)->find()->toArray(); $file = UploadFile::where('file_id', $info['group_share_img_id'])->field('file_path,domain')->find(); $info['group_share_img'] = getUrl($file['file_path'], $file['domain']); + + $file1 = UploadFile::where('file_id', $info['logo_image_id'])->field('file_path,domain')->find(); + $info['logo_image'] = getUrl($file1['file_path'], $file1['domain']); return $this->renderSuccess($info); } diff --git a/app/api/model/Goods.php b/app/api/model/Goods.php index 21b228a4..53b85f23 100644 --- a/app/api/model/Goods.php +++ b/app/api/model/Goods.php @@ -544,20 +544,21 @@ class Goods extends GoodsModel // $price_list_plus[] = GoodsPriceModel::getDiscountPrice($v, 1, $goods['goods_price_min']); // $price_list_dealer[] = GoodsPriceModel::getDiscountPrice($v, 2, $goods['goods_price_min']); // } + $goods['line_price_min'] = $goods['goods_price_min'];//划线价格等于市场价 //价格判断 if (UserService::isstore()) { $priceArr = \app\common\model\PriceSet::distributionPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); $goods['goods_price_min_plus'] = $priceArr['membershipPrice']; $goods['goods_price_min_dealer'] = $priceArr['distributionPrice']; - + $goods['goods_price_min'] = $goods['cost_price_min'];//店长售价，展示为成本价 // $goods['goods_price_min_plus'] = min($price_list_plus); // $goods['goods_price_min_dealer'] = min($price_list_dealer); } elseif (UserService::isPlusMember()) { - $goods['goods_price_min_plus'] = \app\common\model\PriceSet::membershipPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); + $goods['goods_price_min'] = \app\common\model\PriceSet::membershipPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); //$goods['goods_price_min_plus'] = min($price_list_plus); } elseif (UserService::isDealerMember()) { $priceArr = \app\common\model\PriceSet::distributionPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); - $goods['goods_price_min_dealer'] = $priceArr['distributionPrice']; + $goods['goods_price_min'] = $priceArr['distributionPrice']; //$goods['goods_price_min_dealer'] = min($price_list_dealer); } // 会员折扣价: 商品sku列表 @@ -573,17 +574,18 @@ class Goods extends GoodsModel $priceArr = \app\common\model\PriceSet::distributionPrice($skuItem['goods_price'], $skuItem['cost_price'], $catIds); $skuItem['goods_price_min_plus'] = $priceArr['membershipPrice']; $skuItem['goods_price_min_dealer'] = $priceArr['distributionPrice']; - + $skuItem['goods_price_min'] = $skuItem['cost_price_min'];//店长售价，展示为成本价 // $skuItem['goods_price_plus'] = min($temp_price_plus); // $skuItem['goods_price_dealer'] = min($temp_price_dealer); } elseif (UserService::isPlusMember()) { - $skuItem['goods_price_plus'] = \app\common\model\PriceSet::membershipPrice($skuItem['goods_price'], $skuItem['cost_price'], $catIds); + //$skuItem['goods_price_plus'] = \app\common\model\PriceSet::membershipPrice($skuItem['goods_price'], $skuItem['cost_price'], $catIds); + $skuItem['goods_price_min'] = \app\common\model\PriceSet::membershipPrice($skuItem['goods_price'], $skuItem['cost_price'], $catIds); //$skuItem['goods_price_plus'] = min($temp_price_plus); } elseif (UserService::isDealerMember()) { $priceArr = \app\common\model\PriceSet::distributionPrice($skuItem['goods_price'], $skuItem['cost_price'], $catIds); - $skuItem['goods_price_min_dealer'] = $priceArr['distributionPrice']; - + //$skuItem['goods_price_min_dealer'] = $priceArr['distributionPrice']; + $skuItem['goods_price_min'] = $priceArr['distributionPrice']; //$skuItem['goods_price_dealer'] = min($temp_price_dealer); } @@ -598,6 +600,7 @@ class Goods extends GoodsModel // } // $goods['skuInfo']['goods_price'] = min($sku_price_plus); $goods['skuInfo']['goods_price'] = \app\common\model\PriceSet::membershipPrice($goods['skuInfo']['goods_price'], $goods['skuInfo']['cost_price'], $catIds); + } elseif (UserService::isDealerMember()) { // $sku_price_dealer = []; // foreach ($catIds as $k => $v) { diff --git a/app/api/service/Goods.php b/app/api/service/Goods.php index 0f827d74..ed517c8d 100644 --- a/app/api/service/Goods.php +++ b/app/api/service/Goods.php @@ -313,13 +313,14 @@ class Goods extends GoodsService 'goods_name' => $goods['goods_name'], 'selling_point' => $goods['selling_point'], 'goods_image' => $goods['goods_image'], - 'goods_price_min' => $goods['goods_price_min'], + 'goods_price_min' => $goods['goods_price_min'],//商品价格 'goods_price_max' => $goods['goods_price_max'], - 'line_price_min' => $goods['line_price_min'], + 'line_price_min' => $goods['goods_price_min'],//划线价格等于市场价 'line_price_max' => $goods['line_price_max'], 'goods_sales' => $goods['goods_sales'], 'remaizhishu' => $goods['remaizhishu'], ]; + if (UserService::isLogin()) { $catService = new \app\store\model\GoodsCategoryRel(); $catIds = $catService->where(['goods_id' => $goods['goods_id']])->column('category_id'); @@ -331,18 +332,24 @@ class Goods extends GoodsService //价格判断 if (UserService::isstore()) { - $priceArr = \app\common\model\PriceSet::distributionPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); + + //$priceArr = \app\common\model\PriceSet::distributionPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); - $temp['goods_price_min_plus'] = $priceArr['membershipPrice']; - $temp['goods_price_min_dealer'] = $priceArr['distributionPrice']; + // $temp['goods_price_min_plus'] = $priceArr['membershipPrice']; + // $temp['goods_price_min_dealer'] = $priceArr['distributionPrice']; + $temp['goods_price_min'] = $goods['cost_price_min']; // $temp['goods_price_min_plus'] = min($price_list_plus); // $temp['goods_price_min_dealer'] = min($price_list_dealer); } elseif (UserService::isPlusMember()) { - $temp['goods_price_min_plus'] = \app\common\model\PriceSet::membershipPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); + //$temp['goods_price_min_plus'] = \app\common\model\PriceSet::membershipPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); + $temp['goods_price_min'] = \app\common\model\PriceSet::membershipPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); + // $temp['goods_price_min'] = $temp['goods_price_min_plus']; + // $temp['goods_price_max'] = $temp['goods_price_min_plus']; //$temp['goods_price_min_plus'] = min($price_list_plus); } elseif (UserService::isDealerMember()) { $priceArr = \app\common\model\PriceSet::distributionPrice($goods['goods_price_min'], $goods['cost_price_min'], $catIds); - $temp['goods_price_min_dealer'] = $priceArr['distributionPrice']; + //$temp['goods_price_min_dealer'] = $priceArr['distributionPrice']; + $temp['goods_price_min'] = $priceArr['goods_price_min_dealer']; //$temp['goods_price_min_dealer'] = min($price_list_dealer); } }