Merge remote-tracking branch 'origin/dev' into dev

app/common/repositories/store/StoreCategoryRepository.php

@@ -94,7 +94,8 @@ class StoreCategoryRepository extends BaseRepository
      */
     public function getList()
     {
-        $menus = $this->dao->getAllOptions(0);
+        //$menus = $this->dao->getAllOptions(0);取消硬编码
+        $menus = $this->dao->getAllOptions( $this->request->merId());
         $menus = formatCascaderData($menus, 'cate_name', 3);
         return $menus;
     }

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

@@ -2388,7 +2388,7 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-            $orderpri = $cartInfo['list'][$_k]['productAttr']['price'] * $cartInfo['list'][$_k]['cart_num'];
+            $orderpri = bcmul($cartInfo['list'][$_k]['productAttr']['price'], $cartInfo['list'][$_k]['cart_num'], 2);
             //var_dump($ss);
             //支付组合
             $num_yl = 0;
@@ -2412,7 +2412,7 @@ class StoreOrderRepository extends BaseRepository
 
             if ($store_product_datas['mer_id'] == 496) {
 
-                $yanglao = bcmul($num_yl, 0.035, 2) * $cartInfo['list'][$_k]['cart_num'];//给预下订单中的商品展示 养老金 显示作用
+                $yanglao = bcmul(bcmul($num_yl, 0.035, 2) , $cartInfo['list'][$_k]['cart_num'],2);//给预下订单中的商品展示 养老金 显示作用
                 $cartInfo['list'][$_k]['yanglao'] = $yanglao;
                 $pv = $num_yl;
                 //$v['vr']=$v['price'];
@@ -2469,7 +2469,7 @@ class StoreOrderRepository extends BaseRepository
                 $jf = $orderpri - bcmul($store_product_datas['concession_pri'], 0.3, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.3, 2);
                 $jd = $orderpri - bcmul($store_product_datas['concession_pri'], 0.35, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.35, 2);
                 if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
-                    $yanglao = bcmul($store_product_datas['concession_pri'], 0.3, 2) * $cartInfo['list'][$_k]['cart_num'];
+                    $yanglao = bcmul(bcmul($store_product_datas['concession_pri'], 0.3, 2) , $cartInfo['list'][$_k]['cart_num'],2);
                     $cartInfo['list'][$_k]['yanglao'] = $yanglao;
                     $pv = bcmul($store_product_datas['concession_pri'], 0.35, 2);
                     $srtArry['jfduihuan'] = $jf;
@@ -2478,11 +2478,11 @@ class StoreOrderRepository extends BaseRepository
                     $gongxian = bcmul($store_product_datas['concession_pri'], 0.35, 2);
 
                     $jcvr = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
-                    $jcjf = bcmul($store_product_datas['concession_pri'], 0.3, 2) * $cartInfo['list'][$_k]['cart_num'];
+                    $jcjf = bcmul(bcmul($store_product_datas['concession_pri'], 0.3, 2) , $cartInfo['list'][$_k]['cart_num'],2);
                     $jcprice = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
-                    $jcjf1 = bcmul($store_product_datas['concession_pri'], 0.3, 2) * $cartInfo['list'][$_k]['cart_num'];
+                    $jcjf1 = bcmul(bcmul($store_product_datas['concession_pri'], 0.3, 2) , $cartInfo['list'][$_k]['cart_num'],2);
                     $jcvr1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
-                    $jcjd = bcmul($store_product_datas['concession_pri'], 0.35, 2) * $cartInfo['list'][$_k]['cart_num'];
+                    $jcjd = bcmul(bcmul($store_product_datas['concession_pri'], 0.35, 2), $cartInfo['list'][$_k]['cart_num'], 2);
                     $jcprice1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
                     $jcjd1 = bcmul($store_product_datas['concession_pri'], 0.35, 2);
 
@@ -2527,7 +2527,7 @@ class StoreOrderRepository extends BaseRepository
                 $pv = $productSku['plate_mer_profit'] ?? 0.00;
                 //复购区
                 // $pv = bcmul($orderpri, 0.3, 2);
-                $yanglao = bcmul($pv, 0.5, 2) * $cartInfo['list'][$_k]['cart_num'];//给预下订单中的商品展示 养老金 显示作用
+                $yanglao = bcmul(bcmul($pv, 0.5, 2) , $cartInfo['list'][$_k]['cart_num'],2);//给预下订单中的商品展示 养老金 显示作用
                 $cartInfo['list'][$_k]['pv'] = $pv;
                 $cartInfo['list'][$_k]['yanglao'] = $yanglao;
 
@@ -2545,7 +2545,7 @@ class StoreOrderRepository extends BaseRepository
                 $pvProportion = bcsub('1', bcdiv($sharedProsperityRecommendConfigEntityByMaxRewardRatio->getRewardRatio(), '100', 4), 2);
                 $pv = bcmul($productSku['plate_mer_profit'], $pvProportion, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
 
-                $yanglao = bcmul($productSku['price'], CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], 2) * $cartInfo['list'][$_k]['cart_num'];
+                $yanglao = bcmul(bcmul($productSku['price'], CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], 2), $cartInfo['list'][$_k]['cart_num'], 2);
                 $cartInfo['list'][$_k]['pv'] = $pv;
                 $cartInfo['list'][$_k]['yanglao'] = $yanglao;
 
@@ -2563,7 +2563,7 @@ class StoreOrderRepository extends BaseRepository
                     $jf = $orderpri - bcmul($store_product_datas['concession_pri'], 0.3, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.3, 2);
                     $jd = $orderpri - bcmul($store_product_datas['concession_pri'], 0.35, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.35, 2);
                     if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
-                        $yanglao = bcmul($store_product_datas['concession_pri'], 0.3, 2) * $cartInfo['list'][$_k]['cart_num'];
+                        $yanglao = bcmul(bcmul($store_product_datas['concession_pri'], 0.3, 2), $cartInfo['list'][$_k]['cart_num'], 2);
                         $cartInfo['list'][$_k]['yanglao'] = $yanglao;
                         $pv = bcmul($store_product_datas['concession_pri'], 0.35, 2);
                         $srtArry['jfduihuan'] = $jf;
@@ -2574,9 +2574,9 @@ class StoreOrderRepository extends BaseRepository
                         $jcvr = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
                         $jcjf = bcmul($store_product_datas['concession_pri'], 0.3, 2);
                         $jcprice = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
-                        $jcjf1 = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                        $jcjf1 = bcmul(bcmul($store_product_datas['concession_pri'], 0.3, 2), $cartInfo['list'][$_k]['cart_num'], 2);
                         $jcvr1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
-                        $jcjd = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+                        $jcjd = bcmul(bcmul($store_product_datas['concession_pri'], 0.35, 2), $cartInfo['list'][$_k]['cart_num'], 2);
                         $jcprice1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
                         $jcjd1 = bcmul($store_product_datas['concession_pri'], 0.35, 2);
 

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

@@ -1239,7 +1239,7 @@ class ProductRepository extends BaseRepository
                 'ot_price' => set_price_rtrim($value['ot_price']),
                 'unique'   => $value['unique'],
                 'dacang'   => $value['dacang_price'] ? set_price_rtrim($value['dacang_price']) : 'null',
-                'is_usable' => $value['is_usable'],
+                'is_usable' => $value['is_usable'],//是否启用
             ];
             if ($productType) {
                 $sku[$value['sku']]['stock'] = $value['stock'] - $make->seckillSkuOrderCounut($value['unique']); //获取sku的销量
@@ -1849,6 +1849,9 @@ class ProductRepository extends BaseRepository
                         3=>$product['price']//复购金
                     ]
                 ];
+            } else if($product['mer_id'] == 3447){
+                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
+                $yanglao = bcmul($productSku['price'], CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], 2);
             } else {
                 // 商贸区
                 /** @var MerchantRepository $merchant */

crmeb/traits/CategoresDao.php

@@ -224,7 +224,8 @@ trait CategoresDao
     {
         $field = $this->getParentId().',cate_name';
         return ($this->getModel()::getDB())->when(($mer_id !== null),function($query)use($mer_id){
-            $query->where('mer_id', $mer_id);
+            $query->whereIn('mer_id', ['0', $mer_id]);//加上原本0的商品分类
+//            $query->where('mer_id', $mer_id);
         })->when($status,function($query)use($status){
             $query->where($this->getStatus(),$status);
         })->when(($level !== null),function($query)use($level){