复购区新增代码

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

@@ -986,9 +986,10 @@ class ProductRepository extends BaseRepository
 
         $res['yanglao']=($k['yanglao']);
         if($res['mer_id'] != 496){
-
-            $res['jfduihuan']=($k['jfduihuan']);
-            $res['jdduihuan']=($k['jdduihuan']);
+            if($res['mer_id'] != 491){
+                $res['jfduihuan']=($k['jfduihuan']);
+                $res['jdduihuan']=($k['jdduihuan']);
+            }
         }
 
         if($res['mer_id'] == 496){
@@ -1740,9 +1741,51 @@ class ProductRepository extends BaseRepository
                     ];
 
                 }
-            }else if($product['mer_id'] == 476){
-                //复购区
+            }else if($product['mer_id'] == 491){
+                //精彩生活和商贸区
+                $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);
+                    $srtArry['jfduihuan'] =$jf;
+                    $srtArry['jdduihuan'] = $jd;
+                    $jifen = round($product['concession_pri'] * 0.35, 2);
+                    $gongxian = round($product['concession_pri'] * 0.35, 2);
 
+                    $jcvr = $product['price'] - round($product['concession_pri']*0.3, 2);
+                    $jcjf = round($product['concession_pri']*0.3, 2);
+                    $jcprice = $product['price'] - round($product['concession_pri']*0.3, 2);
+                    $jcjf1 = round($product['concession_pri']*0.3, 2);
+                    $jcvr1 = $product['price'] - round($product['concession_pri']*0.35, 2);
+                    $jcjd = round($product['concession_pri']*0.35, 2);
+                    $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
+                    $jcjd1 = round($product['concession_pri']*0.35, 2);
+
+
+                    //支付组合
+                    // $fzone_paytype= [
+
+                    //     2=>[
+                    //         1=>[$jcvr,$jcjf],//VR+积分
+                    //         2=>[$jcprice,$jcjf1],//现金+积分
+                    //         3=>[$jcvr1,$jcjd],//VR+京豆
+                    //         4=>[$jcprice1,$jcjd1],//现金+金豆
+                    //         5=>$product['price'],//VR
+                    //         6=>$product['price'],//现金
+                    //     ]
+                    // ]; 
+
+                    $fzone_paytype= [
+                        ['type'=>'b1','price'=>$jcvr,'other'=>$jcjf],
+                        ['type'=>'b2','price'=>$jcprice,'other'=>$jcjf1],
+                        ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd],
+                        ['type'=>'b4','price'=>$jcprice1,'other'=>$jcjd1],
+                        ['type'=>'b5','price'=>$product['price'],'other'=>0],
+                        ['type'=>'b6','price'=>$product['price'],'other'=>0],
+                    ];
+
+                }
             }
 
 

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

@@ -479,6 +479,18 @@ class MerchantRepository extends BaseRepository
                     $v['jifen'] = round($v['concession_pri'] * 0.35, 2);
                     $v['gongxian'] = round($v['concession_pri'] * 0.35, 2);
                 }
+            }else if($merId == 491){
+                //复购
+                $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['jfduihuan'] =$jf;
+                    $v['jdduihuan'] = $jd;
+                    $v['jifen'] = round($v['concession_pri'] * 0.35, 2);
+                    $v['gongxian'] = round($v['concession_pri'] * 0.35, 2);
+                }
             }
 
 //            $v=($v,$k);
@@ -487,6 +499,7 @@ class MerchantRepository extends BaseRepository
 
 
         }
+        $list["merId"]=$merId;
         $list["list"]=$arr;
         return $list;
     }