扫码返佣更改

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

@@ -549,6 +549,7 @@ class OrderMerchantRepository extends BaseRepository
                 'uid' => $uid,
                 'user_address_ids'=> !empty($address) ? $address['code_list'] . ',' . $address['village_id'] : ''
             ]);
+            Db::name("log")->insert(['data' => '修改地址成功了']);//日志记录
             //修改订单状态
             Db::transaction(function () use ($order, $userRepository, $params) {
                 Db::name("log")->insert(['data' => '2' . json_encode($order)]);
@@ -586,15 +587,6 @@ class OrderMerchantRepository extends BaseRepository
                     'uid' => $order['uid'],
                     'mer_id' => $order['mer_id']
                 ];
-                //大仓非大仓商户分佣
-//                $flag = 0;
-//                if ($merchant['merchant_type'] == 3) {
-//                    $flag = 1;
-//                    $this->dacang_fenyong($order_data, 0);
-//                } elseif ($merchant['merchant_type'] == 1) {
-//                    $flag = 1;
-//                    $this->feidacang_fenyong($order_data, 0);
-//                }
                 $flag = 1;
                 $this->offLineOrder($order['id']);
                 if ($order['mer_id'] == 496) {
@@ -614,7 +606,7 @@ class OrderMerchantRepository extends BaseRepository
                 }
 
 
-                //增加消费分 待释放
+                // 增加消费分 待释放
                 if ($merchant['consumption_score'] == 1) {
                     $merchantRepository = app()->make(MerchantRepository::class);
                     $merchantRepository->consumptionScoreLog($order['mer_id'], 0, $order['money'], '用户到店消费', 3, 1, $order['id'], 1);
@@ -633,17 +625,13 @@ class OrderMerchantRepository extends BaseRepository
                 $this->Tongzheng_integral($actuallyPaid, $mer_id, $id);
 
                 Merchant::getDB()->where('mer_id', $mer_id)->inc('sales', 1)->update();
-                //            //给线下充值用户余额
-                //            Db::name("merchant_user")
-                //                ->where('id', $order->merchant_user_id)
-                //                ->inc('money',$order->money)
-                //                ->update();
+
                 $user = $userRepository->getOne($where);
                 $order = (object)$order;
                 $this->feidacang_fenyong($user, $order_data, 0);
                 $this->doBind($user, $order, $flag);//锁客
                 Db::name("log")->insert(['data' => '绑定用户完成']);//日志记录
-                $this->doBroadcast($actuallyPaid, $mer_id);
+                // $this->doBroadcast($actuallyPaid, $mer_id);
 
                 return true;
             });
@@ -852,20 +840,20 @@ class OrderMerchantRepository extends BaseRepository
                 $user->mer_id = $order->mer_id;
                 $user->save();
                 
-                $mer_fanyongbili = merchantConfig($order['mer_id'], 'base_commission');
+                $mer_fanyongbili = merchantConfig($order->mer_id, 'base_commission');
                 //如果商户返佣比例设置的是0怎查系统设设置的分佣比例
                 if ($mer_fanyongbili == 0) {
                     $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
                 }
                 //如果系统设置的是0就不执行！
                 if ($mer_fanyongbili == 0) {
-                    Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . ' 订单因商家、平台没有设置返佣比例无任何奖励特此记录！']);
+                    Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . ' 订单因商家、平台没有设置返佣比例无任何奖励特此记录！']);
                     return '';
                 }
-                $order_sn = $order['order_sn'] ?? '';
-                $order_id = $order['order_id'] ?? '';
+                $order_sn = $order->order_sn ?? '';
+                $order_id = $order->order_id ?? '';
                 //可分总佣金
-                $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
+                $divisible_commission = bcmul($order->money, bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
                 $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
 
                 //商户锁客收益：PV的5%==14元X5%=0.7元 （加入到用户佣金，可以从用户佣金中提现，商户显示锁客收益总额）
@@ -875,9 +863,9 @@ class OrderMerchantRepository extends BaseRepository
                     $title = "佣金";
                     $source = 1;
                     $commission_type = 3;
-                    $this->add_bill($title, $suo_commission, $user->uid, $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
+                    $this->add_bill($title, $suo_commission, $user->uid, $mark, $commission_type, $order_sn, $order_id, $order->mer_id, $source, 1);
                 } else {
-                    Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
+                    Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
                 }
         
 
@@ -1263,7 +1251,7 @@ class OrderMerchantRepository extends BaseRepository
         foreach ($cursor as $online) {
             if($online['start'] <= $mer_fanyongbili && $online['end'] >= $mer_fanyongbili){
                 $jd = $online['jd'] ?? 0;
-                $gonxian = $online['gonxian'] ?? 0;
+                $gonxian = $online['value'] ?? 0;
             }
         }
         return ['jd'=>$jd,'gonxian'=>$gonxian];
@@ -1276,8 +1264,8 @@ class OrderMerchantRepository extends BaseRepository
         $user_group_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->value("value");
         $user_group_rate = json_decode($user_group_rate, true);
         foreach ($user_group_rate as $online) {
-            if($online['user_group'] == $user_group){
-                $rete = $online['rete'] ? bcdiv($online['rete'], '100', 2) : '0.03';
+            if($online['user_groub'] == $user_group){
+                $rete = $online['rate'] ? bcdiv($online['rate'], '100', 2) : '0.03';
             }
         }
         return $rete;
@@ -1324,8 +1312,6 @@ class OrderMerchantRepository extends BaseRepository
         $mer_gonxian = $getMerchantContribution['gonxian'];
         //  商家京豆比例
         $mer_jd = $getMerchantContribution['jd'];
-        //商家流水分佣
-    //    $mer_luishui_fenyong = '0.25';
         //跨店分佣
         $kd = 0.1;
         /**
@@ -1366,7 +1352,7 @@ class OrderMerchantRepository extends BaseRepository
 
         ///用户可以拿到PV等值的积分和贡献值
         if ($pv >= 0.01) {
-            $userRepository->sign_add($order["uid"], $pv, 1, '消费获得赠送积分', '', '', $order['id'], 1, 'order_merchant');
+            $userRepository->sign_add($order["uid"], $pv, 1, '消费获得赠送积分', '', '', $order['order_id'], 1, 'order_merchant');
             $gongxian_data = [
                 "uid"           =>$order["uid"],
                 "number"  =>    $pv,
@@ -1421,7 +1407,7 @@ class OrderMerchantRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$order_id,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送贡献值",
                 "desc"          =>'',
                 "surplus"       =>$gongxian,
@@ -1431,6 +1417,7 @@ class OrderMerchantRepository extends BaseRepository
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
         }
+
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $jd = bcmul($pv, $mer_jd, 2);
         if ($jd >= 0.01) {
@@ -1441,7 +1428,7 @@ class OrderMerchantRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$order_id,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送京豆",
                 "desc"          =>'',
                 "surplus"       =>$jd,
@@ -1452,13 +1439,8 @@ class OrderMerchantRepository extends BaseRepository
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
         }
 
-        //推荐商家流水返佣
-//        $mer_tuijian_yongjin = bcmul($divisible_commission, $mer_luishui_fenyong, 2);
-//        if ($mer_tuijian_yongjin > 0.01) {
-//            Db::name('store_order')->where('order_id', $order_id)->update(['recommended_merchants' => $mer_tuijian_yongjin]);
-//        } else {
-//            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，推荐商家流水返佣低于0.01无法入库 特此记录！']);
-//        }
+        Db::name('log')->insert(['data' => 'PV:' . $pv .' mer_jd:'. $mer_jd.' mer_gonxian:'.$mer_gonxian]);
+
         //跨店
         $kd_yongjin = bcmul($divisible_commission, $kd, 2);
         if ($kd_yongjin >= 0.01) {

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

@@ -276,13 +276,13 @@ class OrderMerchant extends BaseController
                 $key='api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
                 $app_id='app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0';
                 $member_70 = 'jsdk_member_wx21693792690420';
-                $member_20 = 'jsdk_member_wx21689732717371';
+                $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_20 = 'jsdk_member_wx1689731494604';
+                $member_20 = 'jsdk_member_wx1689758980590';
             }
 
 
@@ -307,7 +307,7 @@ class OrderMerchant extends BaseController
             ];
             $key='api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
             $member_70 = 'jsdk_member_ali1693792697054';
-            $member_20 = 'jsdk_member_ali1689732721557';
+            $member_20 = 'jsdk_member_ali1689817119448';
             // 天地博爱通道
 //            $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
 //            $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
@@ -548,7 +548,6 @@ class OrderMerchant extends BaseController
         }
         $merchant_money=bcmul($order['money'],'0.62',2);
         $pingtai_money=bcmul($order['money'],'0.38',2);
-
             $div_members= [
                 [
                     'member_id'=>0,
@@ -750,9 +749,12 @@ class OrderMerchant extends BaseController
                         return app('json')->success(['result' => 'ERROR']);
                     return app('json')->success(['result' => 'SUCCESS']);
                 }catch (Exception $exception){
+                    Db::name("log")->insert(array('data'=>'【汇付错误日志】'));//日志记录
                     Db::name("log")->insert(array('data'=>$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】'));
                     return app('json')->fail('错误2');
                 }
+            }else{
+                Db::name("log")->insert(array('data'=>'【签名验证失败】'.json_encode($sign_flag).json_encode($post_data_str),));//日志记录
             }
         }elseif ($type == 'HF_pay_user_annual'){
             $post=$this->request->param();