Просмотр исходного кода

还原精彩生活区、商贸区pv值取值字段

family 1 год назад
Родитель
Сommit
57bfe9c9e2
1 измененных файлов с 2 добавлено и 6 удалено
  1. 2 6
      app/common/repositories/store/product/ProductRepository.php

+ 2 - 6
app/common/repositories/store/product/ProductRepository.php

@@ -1704,14 +1704,12 @@ class ProductRepository extends BaseRepository
1704 1704
                 ];
1705 1705
 
1706 1706
             }else if($product['mer_id'] == 439){
1707
-                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
1708 1707
                 //精彩生活和商贸区
1709 1708
                 $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
1710 1709
                 $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
1711 1710
                 if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
1712 1711
                     $yanglao = round($product['concession_pri'] * 0.3, 2);
1713
-//                    $pv = round($product['concession_pri'] * 0.35, 2);
1714
-                    $pv = $productSku['plate_mer_profit']??0.00;
1712
+                    $pv = round($product['concession_pri'] * 0.35, 2);
1715 1713
                     $srtArry['jfduihuan'] =$jf;
1716 1714
                     $srtArry['jdduihuan'] = $jd;
1717 1715
                     $jifen = round($product['concession_pri'] * 0.35, 2);
@@ -1774,14 +1772,12 @@ class ProductRepository extends BaseRepository
1774 1772
                 $merchantInfo = $merchant->get($product['mer_id']);
1775 1773
                 // 1企业2个体3个人
1776 1774
                 if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
1777
-                    $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
1778 1775
                     //商贸区
1779 1776
                     $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
1780 1777
                     $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
1781 1778
                     if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
1782 1779
                         $yanglao = round($product['concession_pri'] * 0.3, 2);
1783
-//                        $pv = round($product['concession_pri'] * 0.35, 2);
1784
-                        $pv = $productSku['plate_mer_profit']??0.00;
1780
+                        $pv = round($product['concession_pri'] * 0.35, 2);
1785 1781
                         $srtArry['jfduihuan'] =$jf;
1786 1782
                         $srtArry['jdduihuan'] = $jd;
1787 1783
                         $jifen = round($product['concession_pri'] * 0.35, 2);