更新

app/common.php

@@ -898,19 +898,3 @@ if (!function_exists("is_json")){
     }
 }
 
-
-
-if (!function_exists("round_optimize")){
-    /**
-     * round公用四舍五入去除
-     * @return string
-     */
-    function round_optimize($amount, $decimals = 2): string
-    {
-        if ($amount > 0) {
-            $factor = pow(10, $decimals);
-            return floor($amount * $factor) / $factor;
-        }
-        return $amount;
-    }
-}

app/common/repositories/BaseRepository.php

@@ -29,4 +29,13 @@ class BaseRepository
     {
         return call_user_func_array([$this->dao, $name], $arguments);
     }
+
+    public function roundOptimize($amount, $decimals = 2)
+    {
+        if ($amount > 0) {
+            $factor = pow(10, $decimals);
+            return floor($amount * $factor) / $factor;
+        }
+        return $amount;
+    }
 }

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

@@ -3827,7 +3827,7 @@ class StoreOrderRepository extends BaseRepository
             $yongjin = $pvfee * $yongjinbili / 100;
 
             // 佣金百分之90进入佣金池  佣金百分之10进入复购金
-            $tuiguanyongjin = round_optimize($yongjin * 0.9, 2);
+            $tuiguanyongjin = $this->roundOptimize($yongjin * 0.9, 2);
             $tuiguanfugou = $yongjin;//复购金赠送函数里面有计算百分之10
 
             //end会费

app/common/repositories/user/UserThirdRepository.php

@@ -747,7 +747,7 @@ class UserThirdRepository extends BaseRepository
     /**
      * 添加预估积分记录
      */
-    public static function yuguJifen($price,$user_id,$order_sn,$type_shop)
+    public function yuguJifen($price,$user_id,$order_sn,$type_shop)
     {
         if (empty($user_id)) {
             Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, 不存在用户ID"]);
@@ -847,7 +847,7 @@ class UserThirdRepository extends BaseRepository
             //判断是否是老用户  is_old=1是1.0的用户，1.0的用户要总pv*45%的红包
             if($user["is_old"]==1){
                 //添加红包
-                $hongbao=round_optimize($inc_score*0.45,2);
+                $hongbao = $this->roundOptimize($inc_score*0.45,2);
                 $hongbao_data = [
                     "uid"           =>$user_id,
                     "number"  =>    $hongbao,
@@ -875,7 +875,7 @@ class UserThirdRepository extends BaseRepository
         
                 // @todo 用户身份比例
                 $yongjinbili = StoreOrderRepository::getUserGroupRate($sprerdUser['user_group']);
-                $tuiguanyongjin=round_optimize($yongjinbili*$inc_score,2);//按照身份获得佣金
+                $tuiguanyongjin=$this->roundOptimize($yongjinbili*$inc_score,2);//按照身份获得佣金
 
                 //添加推广积分
                 $tuijifendata = [
@@ -896,7 +896,7 @@ class UserThirdRepository extends BaseRepository
 
                 //添加推荐献值 普通用户 贡献值为 pv* 30%；推广人是业务员及以上身份，贡献值为:pv的1:1
                 if($sprerdUser['user_group'] <= 1){
-                    $gongxian = round_optimize($gongxian*0.3,2);
+                    $gongxian = $this->roundOptimize($gongxian*0.3,2);
                 }
                 $tuigangongxian_data = [
                     "uid"           =>$sprerdUser['uid'],

app/controller/merchant/Common.php

@@ -58,7 +58,7 @@ class Common extends BaseController
         $merId = $this->merId;
 
         // $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
-        $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->sum('number');
+        $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->where('status',1)->sum('number');
         $list['fenrunzhi'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->sum('available');
     
         $list['xianxia'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->count();