拉取订单方面的处理

app/common/repositories/user/UserThirdRepository.php

@@ -596,10 +596,29 @@ class UserThirdRepository extends BaseRepository
             ->select()->toArray();
         return $data;
     }
+
     /**
-     * 添加预估积分记录
+     * 修改积分，养老金，贡献值记录状态
      */
+    public static  function  updateJilu($user_id,$order_sn,$type_shop){
+        if (empty($user_id)) {
+            Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 修改积分，养老金，贡献值记录, 不存在用户ID"]);
+            return false;
+        }
+
+        // 更新养老金
+        Db::name("user_bill")->where("uid", $user_id)->where("order_id", $order_sn)->where("order_type", $type_shop)->inc('status', -1)->update();
+        //更新积分
+        Db::name("user_sign_score")->where("uid", $user_id)->where("order_id", $order_sn)->where("order_type", $type_shop)->inc('status', 0)->update();
+        //更新贡献值
+        Db::name("user_sign_gongxian")->where("uid", $user_id)->where("order_id", $order_sn)->where("order_type", $type_shop)->inc('status', 0)->update();
+        log::info("订单 {$order_sn}  用户id ={$user_id} 三方来源={$type_shop} 积分，贡献值，养老金更新");
+        Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 修改积分，养老金，贡献值记录, 更新成功！！！"]);
+    }
 
+    /**
+     * 添加预估积分记录
+     */
 //预估养老金
     public static function yuguJifen($price,$user_id,$order_sn,$type_shop)
     {
@@ -624,9 +643,31 @@ class UserThirdRepository extends BaseRepository
 
             $user = Db::name('user')->where('uid', $user_id)->find();
             $inc_score = decimal2($price*0.5);//pv=佣金的50%=积分=贡献值
+            log::info("===========dddddddddddddddddddd");
+
+
+            //每个表的统计值
+            $jfzongwei=Db::name('user_sign_score')->where('status', -1)->where('uid', $user_id)->sum('reward_socre');;
+            $gxzongwei=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user_id)->sum('numbr');;
+//            type_shop 1 拼多多 ，5淘宝
+            log::info("==========={$jfzongwei}");
+
+            $make="";
+            if($type_shop==1){
+                $make="拼多多";
+            }else if($type_shop==5){
+                $make="淘宝";
+            }else if($type_shop==6){
+                $make="京东";
+            }else if($type_shop==3){
+                $make="苏宁";
+            }else if($type_shop==2){
+                $make="唯品会";
+            }
+
             $user_score = $user['score'];
-            $surplus=$user_score + $inc_score;
-            $surplusgongxian=$user['contribute'] + $inc_score;
+            $surplus=$user_score + $inc_score+$jfzongwei;
+            $surplusgongxian=$user['contribute'] + $gxzongwei;
 
             $data = [
                 "uid"           =>  $user_id,
@@ -635,7 +676,7 @@ class UserThirdRepository extends BaseRepository
                 "status"        =>  -1,
                 "order_type"    =>  $type_shop,
                 "order_id"      =>  $order_sn,
-                "mark"          =>  "购买三方商品赠送积分",
+                "mark"          =>  "购买{$make}商品赠送积分",
                 "surplus"       =>  $surplus,
                 "pm"            =>  1,
                 "source_type"   =>  3
@@ -666,9 +707,9 @@ class UserThirdRepository extends BaseRepository
                 "status"        =>-1,
                 "order_type"    =>$type_shop,
                 "order_id"      =>$order_sn,
-                "mark"          =>"购买三方商品赠送贡献值",
+                "mark"          =>"购买{$make}商品赠送贡献值",
                 "desc"          =>'',
-                "surplus"       =>$surplusgongxian,
+                "surplus"       =>$surplusgongxian+$gxzongwei,
                 "type"          =>1
             ];
 

app/controller/api/store/product/DaTaoKe.php

@@ -393,6 +393,12 @@ class DaTaoKe
                 );
             } else {
                 $localOrder->save($order);//更新订单信息
+                //修改积分和贡献,yanglaojin值记录
+                $orderThird->updateJilu(
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    5);
+                //修改养老金记录
             }
 
         }

app/controller/api/store/product/Jd.php

@@ -107,6 +107,7 @@ class Jd extends BaseController
         if (empty($apiName)) {
             return false;
         }
+        log::info("url京东111");
         //公共请求参数
         $requestParams = [
             'method'            => $apiName,
@@ -121,6 +122,8 @@ class Jd extends BaseController
         $sign = $this->paramSign($orderData);
         $requestParams['sign'] = $sign;
         $res = $this->apiSign($requestParams);
+        log::info("url京东end");
+        log::info($res);
         return $res;
     }
 
@@ -352,6 +355,8 @@ class Jd extends BaseController
         $result = json_decode($result, true);
         $result = json_decode($result['jd_union_open_promotion_common_get_responce']['getResult'], true);
         $result = $result['data']['clickURL'];
+        log::info("京东详情==========");
+        log::info($result);
         return $result ?? '';
     }
 
@@ -608,6 +613,21 @@ class Jd extends BaseController
                 $order['image_url'] =  $third_party_goods_json_detail['thumb']??'';
 
                 $orderThird->createOrder('order_jd', $order, strtotime($order['create_time'])); //订单写入数据库
+                //预估养老金
+                $orderThird->yuguOrder(
+                    $order['jd_id'],
+                    $order['commission'],
+                    $order['uid'],
+                    $order['order_sn'],
+                    6,
+                    'order_jd');
+                //预估积分
+                $orderThird->yuguJifen(
+                    $order['commission'],
+                    $order['uid'],
+                    $order['order_sn'],
+                    6
+                );
             } else {
                 //更新
                 if ($orderVip['status'] != $order['status']) {
@@ -618,21 +638,7 @@ class Jd extends BaseController
                     $orderThird->saveOrder("order_jd", ['order_jd_id' => $orderVip['order_jd_id']], $saveOrderPdd); //修改订单
                 }
             }
-            //预估养老金
-            $orderThird->yuguOrder(
-                $order['jd_id'],
-                $order['commission'],
-                $order['uid'],
-                $order['order_sn'],
-                6,
-                'order_jd');
-            //预估积分
-            $orderThird->yuguJifen(
-                $order['commission'],
-                $order['uid'],
-                $order['order_sn'],
-                6
-            );
+
         }
     }
 

app/controller/api/store/product/Jt.php

@@ -30,13 +30,23 @@ class Jt extends BaseController
     protected $token = '';
     public $userThird;
 
+//    public function __construct(App $app)
+//    {
+//        parent::__construct($app);
+//        $this->jttAppId = '2405141108368287';
+//        $this->jttAppKey = '64c048deeed21a02729ac488e5c9062b';
+//        $this->unionId = '2034593744';
+//        $this->token = 'c4cee6b2d2206571094be81ec102f0b1de1eb28b71f6098a50d00dcc587d61adbede1dbe44775d7a';
+//        $this->userThird = app()->make(UserThirdRepository::class);
+//    }
+
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->jttAppId = '2405141108368287';
-        $this->jttAppKey = '64c048deeed21a02729ac488e5c9062b';
-        $this->unionId = '2034593744';
-        $this->token = 'c4cee6b2d2206571094be81ec102f0b1de1eb28b71f6098a50d00dcc587d61adbede1dbe44775d7a';
+        $this->jttAppId = '2012251037214523';
+        $this->jttAppKey = '0800cae09b49da38ef384a8170149d78';
+        $this->unionId = '1003309121';
+        $this->token = '5ce3da55dc739b6e7d9021d59618c5fa70f064fb9156c8a24e932f74f735d92de73585d1d15d82f1';
         $this->userThird = app()->make(UserThirdRepository::class);
     }
 
@@ -425,6 +435,9 @@ class Jt extends BaseController
         if(empty($return)){
             return app('json')->fail('商品下架不存在', null, 401);
         }
+
+        log::info("京东最后详情");
+        log::info($return);
         return app("json")->success("获取详情成功-aabb,用户{$userId}", $return);
     }
 
@@ -488,6 +501,8 @@ class Jt extends BaseController
         ];
 
         $response = self::curlPost($url, $params);
+        log::info("===京东详情====");
+        log::info($response);
         $rawDetail = $response['result']['goods'] ?? [];
         $return = [];
 
@@ -780,6 +795,7 @@ class Jt extends BaseController
     public function operateOrderReal($formatLists)
     {
         $orderThird = app()->make(UserThirdRepository::class);
+        $type_shop = 6;
         foreach ($formatLists as $k => $order) {
             if (empty($order)) continue;
             //判断数据库有无此订单
@@ -787,27 +803,23 @@ class Jt extends BaseController
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = JdOrderModel::create($order);
-            } else {
-                $localOrder->save($order);//更新订单信息
-            }
-            $type_shop = 6;
-            //预估养老金
-            $yanglaojin_order = $orderThird->yuguOrder(
-                $localOrder['order_jd_id'],
-                $localOrder['commission'],
-                $localOrder['uid'],
-                $localOrder['order_sn'],
-                $type_shop,
-                'order_jd');
-            $yanglaojin = $yanglaojin_order['extension_one'] ?? 0;
-            //预估积分
-            $orderThird->yuguJifen(
-                $order['commission'],
-                $order['uid'],
-                $order['order_sn'],
-                6
-            );
-            //直推奖处理
+                //预估养老金
+                $yanglaojin_order = $orderThird->yuguOrder(
+                    $localOrder['order_jd_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop,
+                    'order_jd');
+                $yanglaojin = $yanglaojin_order['extension_one'] ?? 0;
+                //预估积分
+                $orderThird->yuguJifen(
+                    $order['commission'],
+                    $order['uid'],
+                    $order['order_sn'],
+                    6
+                );
+                //直推奖处理
 //            $orderThird->yuguZhitui(
 //                $localOrder['commission'],
 //                $localOrder['uid'],
@@ -815,6 +827,11 @@ class Jt extends BaseController
 //                $localOrder['order_sn'],
 //                $localOrder['order_jd_id']
 //            );
+            } else {
+                $localOrder->save($order);//更新订单信息
+            }
+
+
         }
     }
 

app/controller/api/store/product/Su.php

@@ -747,24 +747,25 @@ class Su extends BaseController
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = SuOrderModel::create($order);
+                //预估养老金
+                $orderThird->yuguOrder(
+                    $localOrder['order_su_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    3,
+                    'order_su');
+                //预估积分
+                $orderThird->yuguJifen(
+                    $order['commission'],
+                    $order['uid'],
+                    $order['order_sn'],
+                    3
+                );
             } else {
                 $localOrder->save($order);//更新订单信息
             }
-            //预估养老金
-            $orderThird->yuguOrder(
-                $localOrder['order_su_id'],
-                $localOrder['commission'],
-                $localOrder['uid'],
-                $localOrder['order_sn'],
-                3,
-                'order_su');
-            //预估积分
-            $orderThird->yuguJifen(
-                $order['commission'],
-                $order['uid'],
-                $order['order_sn'],
-                3
-            );
+
         }
     }
 

app/controller/api/store/product/TaoKe.php

@@ -367,8 +367,11 @@ class TaoKe extends BaseController
             $uid=0;
         }
 
+        log::info("===doGetPinDetail==={$goodsId}+======{$uid}");
         //获取商品详情
         $result = $this->doGetPinDetail($goodsId, $uid);
+        log::info("===doGetPinDetail");
+        log::info($result);
         $log = [
             'flag' => '拼多多详情',
             'content' => json_encode($result,JSON_UNESCAPED_UNICODE),
@@ -537,9 +540,16 @@ class TaoKe extends BaseController
         $apiName = 'pdd.ddk.goods.pid.generate';
         $params = [
             'number' => 1,
-            'p_id_name_list' => json_encode([env("APP_URL")."-".$uid])
+//            'p_id_name_list' => json_encode([env("APP_URL")."-".$uid])
+            'p_id_name_list' => json_encode(["https://api.gdjbp.com"."-".$uid])
         ];
+        log::info("=============apiName===+======");
+        log::info($apiName);
+        log::info("==========111111===params===+=======");
+        log::info($params);
         $result = $this->getUrlResult($apiName, $params);
+        log::info("=============result===");
+        log::info($result);
         if ($result) {
             $data =
                 [
@@ -832,42 +842,45 @@ class TaoKe extends BaseController
         foreach ($orderLists as $k => $order) {
             if (empty($order)) continue;
             //判断数据库有无此订单
+            $type_shop = 1;
+            log::info("pddsnsnsn==={$order['order_sn']}");
             $localOrder = PddOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
+            log::info("pddorder===");
+            log::info($localOrder);
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = PddOrderModel::create($order);
+                //预估养老金
+                $yanglaojin_order = $orderThird->yuguOrder(
+                    $localOrder['order_pdd_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop,
+                    'order_pdd');
+                //预估积分
+                $orderThird->yuguJifen(
+                    $localOrder['commission'] ,
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop
+
+                );
+//            //直推奖处理
+//            $orderThird->yuguZhitui(
+//                $localOrder['commission'],
+//                $localOrder['uid'],
+//                $type_shop,
+//                $localOrder['order_sn'],
+//                $localOrder['order_pdd_id']
+//            );
             } else {
                 if ($localOrder['pin_order_status'] != $order['pin_order_status']) {
                     $localOrder->save($order);//更新订单信息
                 }
             }
-            $type_shop = 1;
-            //预估养老金
-            $yanglaojin_order = $orderThird->yuguOrder(
-                $localOrder['order_pdd_id'],
-                $localOrder['commission'],
-                $localOrder['uid'],
-                $localOrder['order_sn'],
-                $type_shop,
-                'order_pdd');
-            $yanglaojin = $yanglaojin_order['extension_one'] ?? 0;
-            //预估积分
-            $orderThird->yuguJifen(
-                $localOrder['pay_amount'] + $yanglaojin,
-                $localOrder['uid'],
-                'order_pdd',
-                $localOrder['order_pdd_id'],
-                $type_shop,
-                $localOrder['order_sn']
-            );
-            //直推奖处理
-            $orderThird->yuguZhitui(
-                $localOrder['commission'],
-                $localOrder['uid'],
-                $type_shop,
-                $localOrder['order_sn'],
-                $localOrder['order_pdd_id']
-            );
+
+
         }
     }
 

app/controller/api/user/User.php

@@ -1215,10 +1215,10 @@ class User extends BaseController
 //        }
         if ($pm==0){
 
-            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
-            $data = DB::name('user_sign_score')->where($where)->where('pm', 2)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 2)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
@@ -1510,7 +1510,7 @@ class User extends BaseController
         $data['all_gzc'] = set_price_rtrim(sprintf("%01.2f", $gzc));
         // 总养老金
         $data['all_yanglao'] = set_price_rtrim($onlineYanglaoUserBill + $onlineYanglaoGzc + $clearYanglao + $gzc);
-        // 一壶茶平台养老金
+        // 平台养老金
         $data['all_yanglao_yhc'] = set_price_rtrim($onlineYanglaoUserBill + $onlineYanglaoGzc + $clearYanglao);
         // 未结算养老金=预估养老金，不能包含进入公证处未成功的记录(这部分是已结算的)
         $data['all_yanglao_yugu'] = set_price_rtrim(round($onlineYanglaoUserBill, 2));
@@ -1518,7 +1518,7 @@ class User extends BaseController
         $data['all_yanglao_clear'] = set_price_rtrim(round($onlineYanglaoGzc+$clearYanglao, 2));
         // 已入账养老金
         $data['all_yanglao_in'] = set_price_rtrim(round($clearYanglao, 2));
-        // 一壶茶平台未入账养老金
+        // 平台未入账养老金
         $data['all_yanglao_nclear'] = set_price_rtrim(round($onlineYanglaoGzc + $onlineYanglaoUserBill, 2));
         // 待发起
         $data['all_yanglao_wait'] = set_price_rtrim(round($onlineYanglaoGzc, 2));