订单检查接口新增是否商贸区字段

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

@@ -1963,7 +1963,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 = '')
+    public function cartIdByOrderInfo($uid, array $cartId, int $addressId = null, $confirm = true, $psType = true, $payType = 0, $youhui_price_key = '',$is_commercetrade=0)
     {
         $address = null;
         if ($psType) {//是否需要地址
@@ -2286,7 +2286,7 @@ class StoreOrderRepository extends BaseRepository
                 }
 
 
-            } else if ($store_product_datas['mer_id'] == 439) {
+            } else if ($store_product_datas['mer_id'] == 439 || $is_commercetrade) {
 
 
                 //精彩生活和商贸区
@@ -2323,25 +2323,33 @@ class StoreOrderRepository extends BaseRepository
                     //     ]
                     // ];
 
-                    $cartInfo['list'][$_k]['fzone_paytype'] = [
+                    if ($is_commercetrade){
+                        $cartInfo['list'][$_k]['fzone_paytype'] = [
+                            ['type' => 'commercetrade_cash_integral', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
+                            ['type'=>'commercetrade_peking_bean','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
+                            ['type' => 'commercetrade_cash', 'price' => $orderpri, 'other' => 0, "note" => "现金"]
+                        ];
+                    } else {
+                        $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"=>"现金"],
 
 
-                    ];
+                        ];
+                    }
 
 
                 }

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

@@ -70,12 +70,13 @@ 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);
+        $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType,'',$is_commercetrade);
         $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');