Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2351,6 +2351,8 @@ class StoreOrderRepository extends BaseRepository
 
                 }
             } else if ($store_product_datas['mer_id'] == 491) {
+//                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
+//                $pv = $productSku['plate_mer_profit']??0.00;
                 //复购区
                 $pv = round($orderpri * 0.3, 2);
                 $yanglao = round($pv * 0.5, 2);//给预下订单中的商品展示 养老金 显示作用

app/common/repositories/store/product/ProductRepository.php

@@ -428,8 +428,8 @@ class ProductRepository extends BaseRepository
                         "share_num"     => 0,
                         "stock_num"     => 0,
                         "shares_num"    => 0,
+                        'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
-                        'gong_mer_price' => $value['gong_mer_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
                     ];
                 } else {
@@ -455,8 +455,8 @@ class ProductRepository extends BaseRepository
                         "share_num"     => (isset($value['share_num']) && $value['share_num'] !== '') ? $value['share_num'] : 0,
                         "stock_num"     => (isset($value['stock_num']) && $value['stock_num'] !== '') ? $value['stock_num'] : 0,
                         "shares_num"    => (isset($value['shares_num']) && $value['shares_num'] !== '') ? $value['shares_num'] : 0,
+                        'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
-                        'gong_mer_price' => $value['gong_mer_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
                     ];
                 }
@@ -1704,12 +1704,14 @@ class ProductRepository extends BaseRepository
                 ];
 
             }else if($product['mer_id'] == 439){
+                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
                 //精彩生活和商贸区
                 $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
                 $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
                 if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
                     $yanglao = round($product['concession_pri'] * 0.3, 2);
-                    $pv = round($product['concession_pri'] * 0.35, 2);
+//                    $pv = round($product['concession_pri'] * 0.35, 2);
+                    $pv = $productSku['plate_mer_profit']??0.00;
                     $srtArry['jfduihuan'] =$jf;
                     $srtArry['jdduihuan'] = $jd;
                     $jifen = round($product['concession_pri'] * 0.35, 2);
@@ -1749,8 +1751,11 @@ class ProductRepository extends BaseRepository
 
                 }
             }else if($product['mer_id'] == 491){
-                $num_yl = $product['price'];
-                $pv= $num_yl * 0.3;
+//                $num_yl = $product['price'];
+//                $pv= $num_yl * 0.3;
+                // 获取商品sku
+                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
+                $pv = $productSku['plate_mer_profit']??0.00;
                 $yanglao = round($pv * 0.5, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
@@ -1769,12 +1774,14 @@ class ProductRepository extends BaseRepository
                 $merchantInfo = $merchant->get($product['mer_id']);
                 // 1企业2个体3个人
                 if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
+                    $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
                     //商贸区
                     $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
                     $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
                     if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
                         $yanglao = round($product['concession_pri'] * 0.3, 2);
-                        $pv = round($product['concession_pri'] * 0.35, 2);
+//                        $pv = round($product['concession_pri'] * 0.35, 2);
+                        $pv = $productSku['plate_mer_profit']??0.00;
                         $srtArry['jfduihuan'] =$jf;
                         $srtArry['jdduihuan'] = $jd;
                         $jifen = round($product['concession_pri'] * 0.35, 2);
@@ -1801,10 +1808,6 @@ class ProductRepository extends BaseRepository
                     }
                 }
             }
-
-
-
-
         }else{//线下商品
 
             if ($mer_id>0){

app/common/repositories/system/merchant/MerchantRepository.php

@@ -468,20 +468,27 @@ class MerchantRepository extends BaseRepository
                 ];
 
             }else if($merId == 439 || $is_commercetrade){
+                // 获取商品sku
+                $productSku = Db::name('store_product_attr_value')->where('product_id', $v['product_id'])->order('price asc')->find();
                 //精彩生活和商贸区
                 $jf = $v['price'] - round($v['concession_pri']*0.3, 2) . ' + ' . round($v['concession_pri']*0.3, 2);
                 $jd = $v['price'] - round($v['concession_pri']*0.35, 2) . ' + ' . round($v['concession_pri']*0.35, 2);
                 if($v['concession_pri'] !=null || $v['concession_pri'] !=0){
                     $v['yanglao'] = round($v['concession_pri'] * 0.3, 2);
-                    $v['pv'] = round($v['concession_pri'] * 0.35, 2);
+//                    $v['pv'] = round($v['concession_pri'] * 0.35, 2);
+                    $v['pv'] = $productSku['plate_mer_profit']??0.00;
                     $v['jfduihuan'] =$jf;
                     $v['jdduihuan'] = $jd;
                     $v['jifen'] = round($v['concession_pri'] * 0.35, 2);
                     $v['gongxian'] = round($v['concession_pri'] * 0.35, 2);
                 }
             }else if($merId == 491){
-                $num_yl = $v['price'];
-                $pv= $num_yl * 0.3;
+                // 获取商品sku
+                $productSku = Db::name('store_product_attr_value')->where('product_id', $v['product_id'])->order('price asc')->find();
+                $pv = $productSku['plate_mer_profit']??0.00;
+
+//                $num_yl = $v['price'];
+//                $pv= $num_yl * 0.3;
                 $yanglao = round($pv * 0.5, 2);
                 $v['pv'] = $pv;
                 $v['yanglao'] = $yanglao;

app/common/repositories/user/UserThirdRepository.php

@@ -298,7 +298,7 @@ class UserThirdRepository extends BaseRepository
     public function repurchaseAreaEstimateAnnuityOrder($order_id, $commission, $pid, $order_sn, $type, $table)
     {
         //用户商家信息
-        $user_mer = $this->getMer($pid);
+//        $user_mer = $this->getMer($pid);
         try {
             $money=$commission;
             //返佣比例
@@ -318,7 +318,7 @@ class UserThirdRepository extends BaseRepository
                 "order_sn"=>$order_sn,
                 "order_id"=>$order_id,
                 "uid"=>$pid,
-                "mer_id"=>$user_mer,
+                "mer_id"=>Db::name("store_order")->where("order_id",$order_id)->value("mer_id"),
                 "total_price"=>$commission,
                 "extension_one"=>$extension_one,
                 "type_shop"=>$type,