商贸区单独拿出到else

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

@@ -2290,7 +2290,7 @@ class StoreOrderRepository extends BaseRepository
                 }
 
 
-            } else if ($store_product_datas['mer_id'] == 439 || $is_commercetrade) {
+            } else if ($store_product_datas['mer_id'] == 439) {
 
 
                 //精彩生活和商贸区
@@ -2327,33 +2327,25 @@ class StoreOrderRepository extends BaseRepository
                     //     ]
                     // ];
 
-                    if ($is_commercetrade){
-                        $cartInfo['list'][$_k]['fzone_paytype'] = [
-                            ['type' => self::commercetrade_cash_integral, 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
-                            ['type'=>self::commercetrade_cash_peking_bean,'price'=>$jcprice,'other'=>$jcjd,"note"=>"现金+京豆"],
-                            ['type' => self::commercetrade_cash, 'price' => $orderpri, 'other' => 0, "note" => "现金"]
-                        ];
-                    } else {
-                        $cartInfo['list'][$_k]['fzone_paytype'] = [
+                    $cartInfo['list'][$_k]['fzone_paytype'] = [
 
-                            // ['type'=>'a1','price'=>100,'other'=>0,'note'=>"VR"],
-                            // ['type'=>'a2','price'=>100,'other'=>0,"note"=>"现金"],
-                            // ['type'=>'a3','price'=>0,'other'=>0,"note"=>"现金+VR"],
+                        // ['type'=>'a1','price'=>100,'other'=>0,'note'=>"VR"],
+                        // ['type'=>'a2','price'=>100,'other'=>0,"note"=>"现金"],
+                        // ['type'=>'a3','price'=>0,'other'=>0,"note"=>"现金+VR"],
 
-                            ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
-                            ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
-                            // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
-                            //['type'=>'b4','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
-                            ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
-                            ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
+                        ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
+                        ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
+                        // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
+                        //['type'=>'b4','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
+                        ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
+                        ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
 
-                            // ['type'=>'c1','price'=>100,'other'=>0,'note'=>"复购金"],
-                            // ['type'=>'c2','price'=>100,'other'=>0,"note"=>"VR"],
-                            // ['type'=>'c3','price'=>100,'other'=>0,"note"=>"现金"],
+                        // ['type'=>'c1','price'=>100,'other'=>0,'note'=>"复购金"],
+                        // ['type'=>'c2','price'=>100,'other'=>0,"note"=>"VR"],
+                        // ['type'=>'c3','price'=>100,'other'=>0,"note"=>"现金"],
 
 
-                        ];
-                    }
+                    ];
 
 
                 }
@@ -2368,6 +2360,64 @@ class StoreOrderRepository extends BaseRepository
                     ['type' => 'c1', 'price' => $orderpri, 'other' => 0, 'note' => "复购金"],
                 ];
 
+            }// 商贸区
+            elseif ($is_commercetrade){
+
+                $jf = $orderpri - round($store_product_datas['concession_pri'] * 0.3, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.3, 2);
+                $jd = $orderpri - round($store_product_datas['concession_pri'] * 0.35, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.35, 2);
+                if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
+                    $yanglao = round($store_product_datas['concession_pri'] * 0.3, 2);
+                    $pv = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $srtArry['jfduihuan'] = $jf;
+                    $srtArry['jdduihuan'] = $jd;
+                    $jifen = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $gongxian = round($store_product_datas['concession_pri'] * 0.35, 2);
+
+                    $jcvr = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
+                    $jcjf = round($store_product_datas['concession_pri'] * 0.3, 2);
+                    $jcprice = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
+                    $jcjf1 = round($store_product_datas['concession_pri'] * 0.3, 2);
+                    $jcvr1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
+                    $jcjd = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $jcprice1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
+                    $jcjd1 = round($store_product_datas['concession_pri'] * 0.35, 2);
+
+                    //var_dump($cartInfo['list'][$_k]);
+                    //支付组合
+                    // $fzone_paytype= [
+
+                    //     2=>[
+                    //         1=>[$jcvr,$jcjf],//VR+积分
+                    //         2=>[$jcprice,$jcjf1],//现金+积分
+                    //         3=>[$jcvr1,$jcjd],//VR+京豆
+                    //         4=>[$jcprice1,$jcjd1],//现金+金豆
+                    //         5=>$orderpri,//VR
+                    //         6=>$orderpri,//现金
+                    //     ]
+                    // ];
+
+                    $cartInfo['list'][$_k]['fzone_paytype'] = [
+
+                        // ['type'=>'a1','price'=>100,'other'=>0,'note'=>"VR"],
+                        // ['type'=>'a2','price'=>100,'other'=>0,"note"=>"现金"],
+                        // ['type'=>'a3','price'=>0,'other'=>0,"note"=>"现金+VR"],
+
+//                        ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
+                        ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
+                        // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
+                        ['type'=>'b4','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
+//                        ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
+                        ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
+
+                        // ['type'=>'c1','price'=>100,'other'=>0,'note'=>"复购金"],
+                        // ['type'=>'c2','price'=>100,'other'=>0,"note"=>"VR"],
+                        // ['type'=>'c3','price'=>100,'other'=>0,"note"=>"现金"],
+
+
+                    ];
+
+
+                }
             }