Merge branch 'master' of https://git.bjtdba.com/shop/php

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 = [
@@ -1353,7 +1353,9 @@ class OrderMerchantRepository extends BaseRepository
                 'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_hongbao")->insert($hongbao_data);//添加记录
-            Db::name('user')->where('uid', $order["uid"])->inc('hongbao', (float)$hongbao)->update();
+            $user_hongbao = Db::name('user')->where('uid', $order["uid"])->value('hongbao');
+            $user_hongbao = bcadd($user_hongbao, (float)$hongbao,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['hongbao'=>$user_hongbao]);
         }
 
         ///用户可以拿到PV等值的积分和贡献值
@@ -1373,7 +1375,9 @@ class OrderMerchantRepository extends BaseRepository
             $ins_data['order_type'] = $order_id;
             $ins_data['settlement_time'] = date('Y-m-d H:i:s');
             Db::name('user_sign_score')->insertGetId($ins_data);
-            Db::name('user')->where('uid', $order["uid"])->inc('score', (float)$pv)->update();
+            $user_score = Db::name('user')->where('uid', $order["uid"])->value('score');
+            $user_score = bcadd($user_score, (float)$pv,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['score'=>$user_score]);
             //贡献值
             $gongxian_data = [
                 "uid"           =>$order["uid"],
@@ -1389,7 +1393,9 @@ class OrderMerchantRepository extends BaseRepository
                 'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            Db::name('user')->where('uid', $order["uid"])->inc('contribute', (float)$pv)->update();
+            $user_contribute = Db::name('user')->where('uid', $order["uid"])->value('contribute');
+            $user_contribute = bcadd($user_contribute, (float)$pv,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['contribute'=>$user_contribute]);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
         }
@@ -1437,7 +1443,9 @@ class OrderMerchantRepository extends BaseRepository
                 'addtime'=>time(),
             ];
             Db::name('user_sign_fugou')->insert($bill);
-            Db::name('user')->where('uid', $order["uid"])->inc('fugou', (float)$tuijian_fugou)->update();
+            $user_fugou = Db::name('user')->where('uid', $top_data["spread_uid"])->value('fugou');
+            $user_fugou = bcadd($user_fugou, (float)$tuijian_fugou,2);
+            Db::name('user')->where('uid', $top_data["spread_uid"])->update(['fugou'=>$user_fugou]);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的复购金比例较低，复购金低于0.01无法入库 特此记录！']);
         }
@@ -1482,7 +1490,7 @@ class OrderMerchantRepository extends BaseRepository
         //  商家京豆比例
         $mer_jd = $getMerchantContribution['jd'];
         //跨店分佣
-        $kd = 0.1;
+        $kd = 0.05;
         /**
          * 各自的比例结束
          */
@@ -1511,7 +1519,7 @@ class OrderMerchantRepository extends BaseRepository
                 "type"          =>1
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute = $merchant_user->contribute + $pv;
+            $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
             $merchant_user->save();
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
@@ -1533,7 +1541,7 @@ class OrderMerchantRepository extends BaseRepository
                 "surplus"       =>$jd,
                 "type"          =>1
             ];
-            $merchant_user->jingdou = $merchant_user->jingdou + $pv;
+            $merchant_user->jingdou = bcadd($merchant_user->jingdou, (float)$jd,2);
             $merchant_user->save();
             Db::name("user_sign_jingdou")->insert($jd_data);//添加记录
         } else {
@@ -1543,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/common/repositories/store/order/StoreOrderRepository.php

@@ -7687,21 +7687,21 @@ class StoreOrderRepository extends BaseRepository
             //汇付分账
             if ($pay_type == 1) {
                 //微信
-                if ($order_group_data['pay_wx'] == 3) {
-                    $tdba_member_id = 'jsdk_member_wx21689732717371';//天地博爱科技公司
-                    $yihucha_member_id = 'jsdk_member_wx21700447226310';//河北省一壶茶电子商务有限公司
+                // if ($order_group_data['pay_wx'] == 3) {
+                    $tdba_member_id = 'jsdk_member_wx21689817115207';//天地博爱科技公司
+                    $yihucha_member_id = 'jsdk_member_wx21689817115207';//河北省一壶茶电子商务有限公司
                     $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
-                } else {
-                    //废弃的
-                    $tdba_member_id = 'jsdk_member_wx1689731494604';
-                    $api_key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
-                    $yihucha_member_id = 'jsdk_member_wx1700272658386';
-                }
-            } else {
+                // } else {
+                //     //废弃的
+                //     $tdba_member_id = 'jsdk_member_wx1689731494604';
+                //     $api_key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+                //     $yihucha_member_id = 'jsdk_member_wx1700272658386';
+                // }
+            } else {    
                 //支付宝
                 $api_key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
-                $tdba_member_id = 'jsdk_member_ali1689732721557';//天地博爱科技公司
-                $yihucha_member_id = 'jsdk_member_ali1700447230042';//河北省一壶茶电子商务有限公司
+                $tdba_member_id = 'jsdk_member_ali1689817119448';//天地博爱科技公司
+                $yihucha_member_id = 'jsdk_member_ali1689817119448';//河北省一壶茶电子商务有限公司
             }
             unset($div_members);
 

app/controller/api/Auth.php

@@ -748,7 +748,8 @@ class Auth extends BaseController
         $data['vr']=set_price_rtrim($data['vr']);//购物金
         $data['hongbao']=set_price_rtrim($data['hongbao']);//红包
         $data['fugou']=set_price_rtrim($data['fugou']);//复购金
-        //$data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
+        $data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
+        $data['annuity'] = set_price_rtrim($data['annuity']);//养老金
         $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',0) -> sum('number');
         $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',1) -> sum('number');
         // $data['brokerage_price'] = $a +$b;

app/controller/api/merchant/order/OrderMerchant.php

@@ -275,13 +275,13 @@ class OrderMerchant extends BaseController
                 $member_id=Db::name('merchant_member')->where('mer_id',$order['mer_id']) ->where("type",3)->value('member_id');
                 $key='api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
                 $app_id='app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0';
-                $member_70 = 'jsdk_member_wx21693792690420';
+                $member_70 = 'jsdk_member_wx21689817115207';
                 $member_20 = 'jsdk_member_wx21689817115207';
             }else{
                 $member_id=Db::name('merchant_member')->where('mer_id',$order['mer_id']) ->where("type",2)->value('member_id');
                 $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
                 $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
-                $member_70 = 'jsdk_member_wx1693641002355';
+                $member_70 = 'jsdk_member_wx1689758980590';
                 $member_20 = 'jsdk_member_wx1689758980590';
             }
 
@@ -306,7 +306,7 @@ class OrderMerchant extends BaseController
                 'buyer_id'=>$order['pay_user_id']
             ];
             $key='api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
-            $member_70 = 'jsdk_member_ali1693792697054';
+            $member_70 = 'jsdk_member_ali1689817119448';
             $member_20 = 'jsdk_member_ali1689817119448';
             // 天地博爱通道
 //            $app_id='app_0827b960-b932-45ec-b800-4e850091b419';

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);
     }