跨店收益比例调整

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1336,7 +1336,7 @@ class OrderMerchantRepository extends BaseRepository
 
         // 用户可以拿到的红包 红包：如果是1.0的老用户 pv的45%放到红包里面。14*45%=6.3元。直至金额满足1.0平台当前用户身份为止就不在反红包了
         $old_vip_limit = Db::name('user_sign_hongbao')->where('uid',$order["uid"])->sum('number') ?? 0;
-        if($user['is_old']==1 && $old_vip_limit < $user['old_vip_limit']){
+        if($user['is_old']==1){
             //添加红包
             $hongbao=bcmul($pv, $yonghu_hongbao, 2);
             $hongbao_data = [
@@ -1490,7 +1490,7 @@ class OrderMerchantRepository extends BaseRepository
         //  商家京豆比例
         $mer_jd = $getMerchantContribution['jd'];
         //跨店分佣
-        $kd = 0.1;
+        $kd = 0.05;
         /**
          * 各自的比例结束
          */
@@ -1551,7 +1551,7 @@ class OrderMerchantRepository extends BaseRepository
         Db::name('log')->insert(['data' => 'PV:' . $pv .' mer_jd:'. $mer_jd.' mer_gonxian:'.$mer_gonxian.' jingdou:'.$merchant_user->jingdou.' contribute:'.$merchant_user->contribute]);
 
         //跨店
-        $kd_yongjin = bcmul($divisible_commission, $kd, 2);
+        $kd_yongjin = bcmul($pv, $kd, 2);
         if ($kd_yongjin >= 0.01) {
             $mer_uid = Db::name("merchant")->where("mer_id",$top_data["mer_id"])->find();
             if ($mer_uid){

app/controller/api/user/User.php

@@ -1998,7 +1998,7 @@ return app("json")->success($data);
         $data['yanglao_yugu_all'] = $data['yanglao_clear_all'] + $data['yanglao_nclear_all'];
         $where['uid'] = $uid;
         $data['totel_money'] = Db::name('user_bill')->where($where)
-            ->whereNotIn('commission_type', [5, 7, 17, 19])
+            ->whereNotIn('commission_type', [0, 5, 17, 19])
             ->when($commission_type == 5, function ($query) use ($where, $startMonth, $endMonth) {
                 $query->whereBetween('create_time', [$startMonth, $endMonth]);
             }, function ($query) use ($where, $month, $startMonth, $endMonth) {
@@ -2009,7 +2009,7 @@ return app("json")->success($data);
 
         $pageInfo = Db::name('user_bill')
             ->where($where)
-            ->whereNotIn('commission_type', [5, 7, 17, 19])
+            ->whereNotIn('commission_type', [0, 5, 17, 19])
             ->when($commission_type == 5, function ($query) use ($where, $startMonth, $endMonth) {
                 $query->whereBetween('create_time', [$startMonth, $endMonth]);
             }, function ($query) use ($where, $month, $startMonth, $endMonth) {
@@ -3217,15 +3217,15 @@ return app("json")->success($data);
         $data['sum_amount'] = Db::name('user_bill')
             ->where('uid', $uid)
             ->where('commission_type', '<>', 5)
+            ->where('commission_type', '<>', 0)
             ->where('pm', 1)
             ->sum('number');
 
-
-
         //未结算
         $data['no_clear_amount'] = Db::name('user_bill')
             ->where('uid', $uid)
             ->where('commission_type', '<>', 5)
+            ->where('commission_type', '<>', 0)
             ->where('pm', 1)
             ->where('status', 0)
             ->sum('number');
@@ -3243,7 +3243,7 @@ return app("json")->success($data);
         //最终 总收益是 = 佣金余额 + 已提现 + 已转VR
         $data['sum_amount'] = $data['sum_amount'] + $data['transition_vr_amount'];
 
-
+        $data['sum_amount'] = set_price_rtrim($data['sum_amount']);
         return app('json')->success($data);
     }