Merge branch 'dev' into sxb-dev-01

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

@@ -1025,7 +1025,7 @@ class ProductRepository extends BaseRepository
                 $s = 8000;
             }
 
-            $res['yanglao'] = round($s * 0.035,2);
+            $res['yanglao'] = bcmul($s, 0.035, 2);  
         }
 
 
@@ -1701,8 +1701,8 @@ class ProductRepository extends BaseRepository
 
             if($product['mer_id'] == 496){
 
-                $yanglao = round($num_yl * 0.035, 2);
-                $pv=$num_yl *0.7;
+                $yanglao = bcmul($num_yl, 0.035, 2);
+                $pv = bcmul($num_yl, 0.7, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -1715,24 +1715,24 @@ class ProductRepository extends BaseRepository
 
             }else if($product['mer_id'] == 439){
                 //精彩生活和商贸区
-                $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);
+                $jf = $product['price'] - bcmul($product['concession_pri'], 0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
+                $jd = $product['price'] - bcmul($product['concession_pri'], 0.35, 2) . ' + ' . bcmul($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);
+                    $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+                    $pv = bcmul($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);
+                    $jifen = bcmul($product['concession_pri'], 0.35, 2);
+                    $gongxian = bcmul($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);
+                    $jcvr = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                    $jcjf = bcmul($product['concession_pri'], 0.3, 2);
+                    $jcprice = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                    $jcjf1 = bcmul($product['concession_pri'], 0.3, 2);
+                    $jcvr1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                    $jcjd = bcmul($product['concession_pri'], 0.35, 2);
+                    $jcprice1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                    $jcjd1 = bcmul($product['concession_pri'], 0.35, 2);
 
 
                     //支付组合
@@ -1764,7 +1764,7 @@ class ProductRepository extends BaseRepository
                 // 获取商品sku
                 $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
                 $pv = $productSku['plate_mer_profit']??0.00;
-                $yanglao = round($pv * 0.5, 2);
+                $yanglao = bcmul($pv, 0.5, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -1783,24 +1783,24 @@ class ProductRepository extends BaseRepository
                 // 1企业2个体3个人
                 if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
                     //商贸区
-                    $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);
+                    $jf = $product['price'] - bcmul($product['concession_pri'],0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
+                    $jd = $product['price'] - bcmul($product['concession_pri'],0.35, 2) . ' + ' . bcmul($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);
+                        $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+                        $pv = bcmul($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);
+                        $jifen = bcmul($product['concession_pri'], 0.35, 2);
+                        $gongxian = bcmul($product['concession_pri'], 0.35, 2);
+
+                        $jcvr = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                        $jcjf = bcmul($product['concession_pri'], 0.3, 2);
+                        $jcprice = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                        $jcjf1 = bcmul($product['concession_pri'], 0.3, 2);
+                        $jcvr1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                        $jcjd = bcmul($product['concession_pri'], 0.35, 2);
+                        $jcprice1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                        $jcjd1 = bcmul($product['concession_pri'], 0.35, 2);
 
                         $fzone_paytype= [
 //                ['type'=>'b1','price'=>$jcvr,'other'=>$jcjf],

app/common/repositories/user/UserIdentityRepository.php

@@ -73,11 +73,11 @@ class UserIdentityRepository extends BaseRepository
      */
     public function form($id = null, array $formData = [])
     {
-        $isCreate = is_null($id);
-        $action = Route::buildUrl($isCreate ? 'systemUserGroupCreate' : 'systemUserGroupUpdate', $isCreate ? [] : compact('id'))->build();
+        $action = Route::buildUrl('configIdentityUpdate' , compact('id'))->build();
         return Elm::createForm($action, [
-            Elm::input('group_name', '用户分组名称')->required()
-        ])->setTitle($isCreate ? '添加用户分组' : '编辑用户分组')->formData($formData);
+            Elm::number('arrive_num_own', '个人达标贡献值')->min(0)->size('large'),
+            Elm::number('arrive_num_team', '团队达标贡献值')->min(0)->size('large')
+        ])->setTitle('业务员升级设置')->formData($formData);
     }
 
     /**