逻辑调整

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);
@@ -1406,7 +1406,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $gongxian,
                 "addtime"       =>time(),
                 "status"        =>-1,
-                "order_type"    =>$order_id,
+                "order_type"    =>2,
                 "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送贡献值",
                 "desc"          =>'',
@@ -1427,7 +1427,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $jd,
                 "addtime"       =>time(),
                 "status"        =>-1,
-                "order_type"    =>$order_id,
+                "order_type"    =>2,
                 "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送京豆",
                 "desc"          =>'',

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