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

app/command/PensionTasks.php

@@ -159,6 +159,109 @@ class PensionTasks extends Command
                     'order_sn'         => $offline['out_trade_no']
                 ];
 //                $StoreOrderRepository->area_manage_details($order_data, 0, 2);
+
+
+
+                // 结算红包
+                $user_sign_hongbao_list = Db::name('user_sign_hongbao')
+                    ->where('status', -1)
+                    ->where('order_id', $offline['id'])
+                    ->whereIn('type', [1, 2])
+                    ->select()
+                    ->toArray();
+                foreach ($user_sign_hongbao_list as $user_sign_hongbao) {
+                    if($user_sign_hongbao['uid']){
+                        // 修改红包
+                        Db::name('user')
+                            ->where('uid', $user_sign_hongbao['uid'])
+                            ->inc('hongbao', (float)$user_sign_hongbao['number'])
+                            ->update();
+                        Db::name('user_sign_hongbao')
+                            ->where('status', -1)
+                            ->where('id', $user_sign_hongbao['id'])
+                            ->update([
+                                'status'          => 1,
+                                'settlement_time' => date('Y-m-d H:i:s')
+                            ]);
+                    }
+                }
+
+
+                // 结算积分
+                $user_sign_score_list = Db::name('user_sign_score')
+                    ->where('status', -1)
+                    ->where('order_id', $offline['id'])
+                    ->whereIn('type', [1, 2])
+                    ->select()
+                    ->toArray();
+                foreach ($user_sign_score_list as $user_sign_score) {
+                    if($user_sign_score['uid']){
+                        // 修改积分
+                        Db::name('user')
+                        ->where('uid', $user_sign_score['uid'])
+                        ->inc('score', (float)$user_sign_score['reward_socre'])
+                        ->update();
+                        Db::name('user_sign_score')
+                            ->where('status', -1)
+                            ->where('id', $user_sign_score['id'])
+                            ->update([
+                                'status'          => 1,
+                                'settlement_time' => date('Y-m-d H:i:s')
+                            ]);
+                    }
+                }
+
+
+                // 结算贡献值
+                $user_sign_gongxian_list = Db::name('user_sign_gongxian')
+                    ->where('status', -1)
+                    ->where('order_id', $offline['id'])
+                    ->whereIn('type', [1, 2])
+                    ->select()
+                    ->toArray();
+                foreach ($user_sign_gongxian_list as $user_sign_gongxian) {
+                    if($user_sign_gongxian['uid']){
+                        // 修改贡献值
+                        Db::name('user')
+                        ->where('uid', $user_sign_gongxian['uid'])
+                        ->inc('contribute', (float)$user_sign_gongxian['number'])
+                        ->update();
+                        Db::name('user_sign_gongxian')
+                        ->where('status', -1)
+                        ->where('id', $user_sign_gongxian['id'])
+                        ->update([
+                            'status'          => 1,
+                            'settlement_time' => date('Y-m-d H:i:s')
+                        ]);
+                    }
+                }
+
+                // 结算佣金
+                $user_bill_list = Db::name('user_bill')
+                ->where('status', 0)
+                ->where('commission_type','<>', 5)
+                ->where([ 'link_id' => $offline['id'], 'order_sn' => $offline['order_sn']])
+                ->select()
+                ->toArray();
+                foreach ($user_bill_list as $user_bill) {
+                    if($user_bill['uid']){
+                        if ($user_bill['commission_type'] != 5) {
+                            if (in_array($user_bill['commission_type'], [7,12,19])) {
+                                Db::name("merchant")
+                                    ->where("mer_id", $user_bill['mer_id'])
+                                    ->inc('brokerage_price', (float)$user_bill['number'])
+                                    ->update();
+                            } else {
+                                Db::name('user')
+                                    ->where('uid', $user_bill['uid'])
+                                    ->inc('brokerage_price', (float)$user_bill['number'])
+                                    ->update();
+                            }
+                        }
+                    }
+                }
+
+
             });
         }
     }

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

@@ -292,7 +292,7 @@ class OrderMerchantRepository extends BaseRepository
             //总可分佣金
             $avaiable = sprintf("%01.2f", $params['money'] * ($base_commission * 0.01));//四舍五入保留两位小数;
             //养老金
-            $pension = sprintf("%01.2f", $avaiable * 0.5);
+            $pension = sprintf("%01.2f", $avaiable * 0.3);
             if($params['mer_id']==496){
                 //把一壶茶电子商务公司的收款码养老金调成2%
                 $pension = sprintf("%01.2f", $params['money'] * 0.02);
@@ -1340,7 +1340,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $hongbao,
                 "addtime"       =>time(),
                 "status"        =>-1,
-                "order_type"    =>$order_id,
+                "order_type"    =>1,
                 "order_id"      =>$order_id,
                 "mark"          =>"消费获得赠送红包",
                 "desc"          =>'',
@@ -1352,13 +1352,27 @@ class OrderMerchantRepository extends BaseRepository
 
         ///用户可以拿到PV等值的积分和贡献值
         if ($pv >= 0.01) {
-            $userRepository->sign_add($order["uid"], $pv, 1, '消费获得赠送积分', '', '', $order['order_id'], 1, 'order_merchant');
+            //积分
+            $ins_data['uid'] = $order["uid"];
+            $ins_data['continuity_day'] = 0;
+            $ins_data['reward_socre'] = $pv;
+            $ins_data['signin_time'] = 0;
+            $ins_data['addtime'] = time();
+            $ins_data['status'] = -1;
+            $ins_data['mark'] = "消费获得赠送积分";
+            $ins_data['source_type'] = 3;
+            $ins_data['settlement_time'] = 0;// 结算时间 真正到了结算时间会结算
+            $ins_data['order_id'] = $order_id;
+            $ins_data['pm'] = 1;
+            $ins_data['order_type'] = $order_id;
+            Db::name('user_sign_score')->insertGetId($ins_data);
+            //贡献值
             $gongxian_data = [
                 "uid"           =>$order["uid"],
                 "number"  =>    $pv,
                 "addtime"       =>time(),
                 "status"        =>-1,
-                "order_type"    =>$order_id,
+                "order_type"    =>1,
                 "order_id"      =>$order_id,
                 "mark"          =>"消费获得赠送贡献值",
                 "desc"          =>'',
@@ -1373,11 +1387,11 @@ class OrderMerchantRepository extends BaseRepository
         //用户推荐人可拿的养老金
         $user_yanglaojin = bcmul($pv, $yonghu_bili_tuijian, 2);
         if ($user_yanglaojin >= 0.01) {
-            $mark = "消费获得养老金" . $user_yanglaojin;
+            $mark = "推荐线下消费获得养老金" . $user_yanglaojin;
             $title = "养老金";
             $source = 1;
             $commission_type = 5;
-            $this->add_bill($title, $user_yanglaojin, $order["uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
+            $this->add_bill($title, $user_yanglaojin, $top_data["spread_uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
         }
@@ -1385,7 +1399,7 @@ class OrderMerchantRepository extends BaseRepository
         //用户推荐人佣金
         $tuijian_yongjin = bcmul($pv, $yonghu_tuijian, 2);
         if ($tuijian_yongjin >= 0.01) {
-            $mark = "用户在大仓消费获得" . $tuijian_yongjin . '佣金';
+            $mark = "推荐线下消费获得" . $tuijian_yongjin . '佣金';
             $title = "佣金";
             $source = 1;
             $commission_type = 3;
@@ -1395,8 +1409,11 @@ class OrderMerchantRepository extends BaseRepository
         }
 
 
-        //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $mer_data = Db::name('merchant')->where('mer_id', $order['mer_id'])->field('uid,mer_id')->find();
+        $userRepository = app()->make(UserRepository::class);
+        $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
+
+        //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $gongxian = bcmul($pv, $mer_gonxian, 2);
         if ($gongxian >= 0.01) {
             $gongxian_data = [
@@ -1405,8 +1422,8 @@ class OrderMerchantRepository extends BaseRepository
                 "pv"            =>$pv,
                 "number"  =>    $gongxian,
                 "addtime"       =>time(),
-                "status"        =>-1,
-                "order_type"    =>$order_id,
+                "status"        =>1,
+                "order_type"    =>2,
                 "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送贡献值",
                 "desc"          =>'',
@@ -1414,6 +1431,8 @@ class OrderMerchantRepository extends BaseRepository
                 "type"          =>1
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+            $merchant_user->contribute += $pv;
+            $merchant_user->save();
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
         }
@@ -1426,14 +1445,16 @@ class OrderMerchantRepository extends BaseRepository
                 "mer_id"        =>$order["mer_id"],
                 "number"  =>    $jd,
                 "addtime"       =>time(),
-                "status"        =>-1,
-                "order_type"    =>$order_id,
+                "status"        =>1,
+                "order_type"    =>2,
                 "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送京豆",
                 "desc"          =>'',
                 "surplus"       =>$jd,
                 "type"          =>1
             ];
+            $merchant_user->jingdou += $pv;
+            $merchant_user->save();
             Db::name("user_sign_jingdou")->insert($jd_data);//添加记录
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -134,7 +134,7 @@ class UserOfflineRechargeRepository extends BaseRepository
                 $user = $userRepository->getOne(['uid' => $unionUser->uid]);
                 if ($unionUser->pension <= 0) return true;
 
-                //496商户线下支付不返回养老金
+                //496商户线下支付不返回养老金   
                 $orders = OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->where('status', 1) ->whereNotIn('mer_id', [496]) ->where('binds',0)->select();
                 foreach ($orders as $order) {
                     app()->make(UserBillRepository::class)->incBill($unionUser->uid, 'now_money', 'commission', [
@@ -153,6 +153,20 @@ class UserOfflineRechargeRepository extends BaseRepository
                     $user->annuity += $order->pension;
                     $user->annuity_num += 1;
                     $user->save();
+
+                    //同步用户部分------------------------------------
+                    //同步红包
+                    Db::name("user_sign_hongbao")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+
+                    //同步佣金
+                    Db::name("user_sign_hongbao")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+
+                    //同步积分
+                    Db::name("user_sign_score")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    
+                    //同步贡献值
+                    Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }
             } catch (\Throwable $e) {

app/common/repositories/user/UserThirdRepository.php

@@ -683,10 +683,10 @@ class UserThirdRepository extends BaseRepository
                 'uid'=>$user_id,
                 'number'=>$inc_score,//数量
                 'status'=>-1,//复购金状态1-有效 0-失效 -1待确认
-                'mark'=>"购买{$make}商品赠送积分",//备注
+                'mark'=>"购买{$make}商品赠送复购金",//备注
                 'order_id'=>$order_sn,//订单id
                 'surplus'=>0,//剩余
-                'order_type'=>11,//关联订单ID
+                'order_type'=>$type_shop,//关联订单ID
                 'type'=>1,//复购金类型 :1赠送，2消耗
                 'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
                 'addtime'=>time(),

app/controller/api/Notify.php

@@ -88,6 +88,7 @@ class Notify
                                     Db::name('user_sign_score')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
                                     Db::name('user_sign_gongxian')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
                                     Db::name('user_sign_fugou')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_sign_hongbao')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
                                 }
                             }catch (\Exception $e) {
                                 Db::name('log')->insert(['data'=>'话费充值支付回调推送订单错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
@@ -1531,18 +1532,28 @@ class Notify
 
     //订单数据补充
     public function buchong(){
-        $list = Db::name('store_order')->where('fzone_paytype', 'not null')->select();
+        $list = Db::name('user_sign_fugou')->where('order_id', 2147483647)->where('mark', '购买话费商品赠送复购金')->where('status', -1)->select();
         foreach($list as $k => $v){
-            $fzone_paytype = json_decode($v['fzone_paytype'], true);
-            if(isset($fzone_paytype['jingdou'])) $update_data['fzone_pay_jingdou'] = $fzone_paytype['jingdou'];
-            if(isset($fzone_paytype['vr'])) $update_data['fzone_pay_vr'] = $fzone_paytype['vr'];
-            if(isset($fzone_paytype['jifen'])) $update_data['fzone_pay_jifen'] = $fzone_paytype['jifen'];
-            if(isset($fzone_paytype['price'])) $update_data['fzone_pay_price'] = $fzone_paytype['price'];
-            if(isset($fzone_paytype['other'])) $update_data['fzone_pay_other'] = $fzone_paytype['other'];
-            if(isset($fzone_paytype['type'])) $update_data['fzone_pay_type'] = $fzone_paytype['type'];
-            if(isset($fzone_paytype['note'])) $update_data['fzone_pay_note'] = $fzone_paytype['note'];
-            Db::name('store_order')->where("order_id", $v['order_id'])->update($update_data);
+            $score = Db::name('user_sign_score')->where('uid', $v['uid'])->where('addtime', $v['addtime'])->where('mark', '购买话费商品赠送积分')->find();
+            if($score){
+                $update_data['status'] = $score['status'];
+                $update_data['order_id'] = $score['order_id'];
+                Db::name('user_sign_fugou')->where("id", $v['id'])->update($update_data);
+            }
         }
+
+
+        // foreach($list as $k => $v){
+        //     $fzone_paytype = json_decode($v['fzone_paytype'], true);
+        //     if(isset($fzone_paytype['jingdou'])) $update_data['fzone_pay_jingdou'] = $fzone_paytype['jingdou'];
+        //     if(isset($fzone_paytype['vr'])) $update_data['fzone_pay_vr'] = $fzone_paytype['vr'];
+        //     if(isset($fzone_paytype['jifen'])) $update_data['fzone_pay_jifen'] = $fzone_paytype['jifen'];
+        //     if(isset($fzone_paytype['price'])) $update_data['fzone_pay_price'] = $fzone_paytype['price'];
+        //     if(isset($fzone_paytype['other'])) $update_data['fzone_pay_other'] = $fzone_paytype['other'];
+        //     if(isset($fzone_paytype['type'])) $update_data['fzone_pay_type'] = $fzone_paytype['type'];
+        //     if(isset($fzone_paytype['note'])) $update_data['fzone_pay_note'] = $fzone_paytype['note'];
+        //     Db::name('store_order')->where("order_id", $v['order_id'])->update($update_data);
+        // }
         return app('json')->success(['result' => 'ok']);
     }
 

app/controller/api/store/service/Huafei.php

@@ -99,6 +99,7 @@ class Huafei extends BaseController
 					Db::name('user_sign_score')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
 					Db::name('user_sign_gongxian')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
 					Db::name('user_sign_fugou')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
+					Db::name('user_sign_hongbao')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
 				}
 	
 				echo 'success';

app/controller/api/user/User.php

@@ -346,16 +346,13 @@ class User extends BaseController
         $where['uid'] = $uid;
 
         if ($pm==0){
-
-            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_fugou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
         }
         if($pm==2){
-            $data = DB::name('user_sign_fugou')->where($where)->where('status', -1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_fugou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         log::info("=======date==={$data}");
         return app("json")->success($data);