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

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

@@ -1967,7 +1967,7 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/9
      */
-    public function cartIdByOrderInfo($uid, array $cartId, int $addressId = null, $confirm = true, $psType = true, $payType = 0, $youhui_price_key = '',$is_commercetrade=0)
+    public function cartIdByOrderInfo($uid, array $cartId, int $addressId = null, $confirm = true, $psType = true, $payType = 0, $youhui_price_key = '')
     {
         $address = null;
         if ($psType) {//是否需要地址
@@ -2360,63 +2360,63 @@ class StoreOrderRepository extends BaseRepository
                     ['type' => 'c1', 'price' => $orderpri, 'other' => 0, 'note' => "复购金"],
                 ];
 
-            }// 商贸区
-            elseif ($is_commercetrade){
+            } else{
+                // 商贸区
+                /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
+                $merchant = app()->make(MerchantRepository::class);
+                $merchantInfo = $merchant->get($store_product_datas['mer_id']);
+                // 1企业2个体3个人
+                if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
+                    $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,//现金
+                        //     ]
+                        // ];
 
-                $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"],
+                        $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' => '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' => '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"=>"现金"],
+                        ];
+                    }
                 }
             }
 

app/controller/api/store/order/StoreOrder.php

@@ -70,13 +70,12 @@ class StoreOrder extends BaseController
     {
         $cartId = (array)$this->request->param('cart_id', []);
         $addressId = (int)$this->request->param('address_id');
-        $is_commercetrade = (int)$this->request->param('is_commercetrade',0);
         $psType = $this->request->param('type',true);//是否需要地址 boolean
         $uid = $this->request->uid();
 
         if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid)))
             return app('json')->fail('已失效或已下单');
-        $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType,'','',$is_commercetrade);
+        $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType);
         $orderInfo['product_type']=0;
         if($this->source=='yhc'){
             $product_type=Db::name('store_cart')->alias('c')->join('store_product p','c.product_id=p.product_id')->whereIn('cart_id',$cartId)->column('p.type');