商户扫码支付调整

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

@@ -1583,6 +1583,8 @@ class OrderMerchantRepository extends BaseRepository
         //可分总佣金
         $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
         $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
+        //更新值
+        Db::name("order_merchant")->where('id', $order_id)->where('out_trade_no', $order_sn)->update(['available'=>$divisible_commission]);
 
         /**
          * 各自的比例开始
@@ -1598,6 +1600,34 @@ class OrderMerchantRepository extends BaseRepository
          * 各自的比例结束
          */
 
+        $gongxian = Db::name('user_sign_gongxian')->where('order_id', $order_id)->find();
+        if(!$gongxian){
+            ///用户可以拿到PV等值贡献值
+            if ($pv >= 0.01) {
+                //贡献值
+                $gongxian_data = [
+                    "uid"           =>$order["uid"]??0,
+                    "number"  =>    $pv,
+                    "addtime"       =>time(),
+                    "status"        =>1,
+                    "order_type"    =>1,
+                    "order_id"      =>$order_id,
+                    "mark"          =>"扫码消费获得赠送贡献值",
+                    "desc"          =>'',
+                    "surplus"       =>$pv,
+                    "type"          =>1,
+                    'settlement_time' => date('Y-m-d H:i:s')
+                ];
+                Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+            } else {
+                Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
+            }
+        }
+
+
+
+
+
         // 商户---------------------------------------------------------------------------------------------------------------
 
         $mer_data = Db::name('merchant')->where('mer_id', $order['mer_id'])->field('uid,mer_id')->find();
@@ -1605,28 +1635,28 @@ class OrderMerchantRepository extends BaseRepository
         $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
-        $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
-        if ($gongxian >= 0.01) {
-            $gongxian_data = [
-                "uid"           =>$mer_data["uid"],
-                "mer_id"        =>$order["mer_id"],
-                "pv"            =>$pv,
-                "number"  =>    $gongxian,
-                "addtime"       =>time(),
-                "status"        =>1,
-                "order_type"    =>2,
-                "order_id"      =>$order_id,
-                "mark"          =>"用户消费商家获得赠送贡献值",
-                "desc"          =>'',
-                "surplus"       =>$gongxian,
-                "type"          =>1
-            ];
-            Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
-            $merchant_user->save();
-        } else {
-            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
-        }
+        // $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
+        // if ($gongxian >= 0.01) {
+            // $gongxian_data = [
+            //     "uid"           =>$mer_data["uid"],
+            //     "mer_id"        =>$order["mer_id"],
+            //     "pv"            =>$pv,
+            //     "number"  =>    $gongxian,
+            //     "addtime"       =>time(),
+            //     "status"        =>1,
+            //     "order_type"    =>2,
+            //     "order_id"      =>$order_id,
+            //     "mark"          =>"用户消费商家获得赠送贡献值",
+            //     "desc"          =>'',
+            //     "surplus"       =>$gongxian,
+            //     "type"          =>1
+            // ];
+            // Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+        //     $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
+        //     $merchant_user->save();
+        // // } else {
+        //     Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
+        // }
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $jd = bcmul($divisible_commission, $mer_jd, 2);

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -171,8 +171,14 @@ class UserOfflineRechargeRepository extends BaseRepository
                     // //同步复购金
                     // Db::name("user_sign_fugou")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
                     
-                    // //同步贡献值
-                    // Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    //同步贡献值
+                    $gongxian = Db::name('user_sign_gongxian')->where('order_id', $order->id)->find();
+                    if($gongxian){
+                        Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                        $user_contribute = Db::name('user')->where('order_id', $order->id)->where('uid', $unionUser->uid)->value('contribute');
+                        $user_contribute = bcadd($user_contribute, $gongxian['number'], 2);
+                        Db::name('user')->where('uid', $unionUser->uid)->update(['contribute'=>$user_contribute]);
+                    }
 
 
 

app/controller/api/user/User.php

@@ -311,14 +311,14 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
 //        if($pm==1){
 //            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 //
 //        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         log::info("=======date==={$data}");

app/controller/merchant/Common.php

@@ -57,9 +57,14 @@ class Common extends BaseController
     {
         $merId = $this->merId;
 
-        $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
+        // $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['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();
+        $list['xianshang'] = Db::name('store_order')->where('mer_id', $merId)->where('paid', 1)->count();
+
+
         return app('json')->success(compact('merId', 'list'));
     }
 
@@ -83,8 +88,9 @@ class Common extends BaseController
         $list = $query->page($pageNum, $pageSize)->order('id desc')->where('mer_id', $merId)->where('paid', 1)->select();
         $list = $list->toArray();
         foreach ($list as $k => $v) {
-            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('pv') ?? 0;
-            $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('order_id', $v['id'])->value('pv') ?? 0;
+            // $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['fenrunzhi'] = $v['available'];
             $list[$k]['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
         }