定时问题调整

app/common/repositories/store/order/StoreOrderRepository.php

@@ -3164,7 +3164,7 @@ class StoreOrderRepository extends BaseRepository
 //            $oldagefee=$this->decimal2($order["extension_one"]* $yanglao * 0.01);
 
         //y养老金最新调整 =佣金的*50%
-        $oldagefee=decimal2($order['total_price']*0.5);
+        $oldagefee=round($order['total_price']*0.5 ,2);
         log::info("++{$order['total_price']}+养老金===={$oldagefee}");
         //当前已扣会费总额
 //            $oldagefee = $oldagefee-$dues;
@@ -3686,6 +3686,7 @@ class StoreOrderRepository extends BaseRepository
     {
         log::info("====进入add——bill");
 //        $old_number=Db::name("user")->where("uid",$uid)->value("brokerage_price");
+        log::info("==uid==={$uid}");
         if ($uid == 0 || $number == 0) {
             return;
         }
@@ -3722,6 +3723,7 @@ class StoreOrderRepository extends BaseRepository
             "type_shop"       => $type_shop
         ];
         log::info("开始添加user——bills");
+        log::info($data);
         Db::name("user_bill")->insert($data);
 
 //        if ($type_shop == 0) {

app/common/repositories/user/UserThirdRepository.php

@@ -601,17 +601,18 @@ class UserThirdRepository extends BaseRepository
      * 修改积分，养老金，贡献值记录状态
      */
     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;
-        }
+//        if (empty($user_id)) {
+//            Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 修改积分，养老金，贡献值记录, 不存在用户ID"]);
+//            return false;
+//        }
 
+        log::info("订单修改开始");
         // 更新养老金
-        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_bill")->where("uid", $user_id)->where("order_sn", $order_sn)->update(['status'=>-1]);
         //更新积分
-        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_score")->where("uid", $user_id)->where("order_id", $order_sn)->update(['status'=>0]);
         //更新贡献值
-        Db::name("user_sign_gongxian")->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)->update(['status'=>0]);
         log::info("订单 {$order_sn}  用户id ={$user_id} 三方来源={$type_shop} 积分，贡献值，养老金更新");
         Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 修改积分，养老金，贡献值记录, 更新成功！！！"]);
     }
@@ -642,13 +643,13 @@ class UserThirdRepository extends BaseRepository
             //更新用户积分
 
             $user = Db::name('user')->where('uid', $user_id)->find();
-            $inc_score = decimal2($price*0.5);//pv=佣金的50%=积分=贡献值
+            $inc_score = round($price*0.5,2);//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');;
+            $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('number');
 //            type_shop 1 拼多多 ，5淘宝
             log::info("==========={$jfzongwei}");
 
@@ -681,7 +682,7 @@ class UserThirdRepository extends BaseRepository
                 "pm"            =>  1,
                 "source_type"   =>  3
                 ];
-            log::info("准备开始添加积分，贡献");
+            log::info("{$make}==准备开始添加积分，贡献");
             Db::name("user_sign_score")->insert($data);//添加积分记录
 
             log::info("准备开始添加积分");

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

@@ -368,9 +368,12 @@ class DaTaoKe
         $orderThird = app()->make(UserThirdRepository::class);
         foreach ($formatLists as $k => $order) {
             log::info("=++++==taobaoorder=====+++");
+
             if (empty($order)) continue;
             //判断数据库有无此订单
             $localOrder = TbOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
+            log::info("localOrder========");
+            log::info($localOrder);
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = TbOrderModel::create($order);
@@ -392,13 +395,16 @@ class DaTaoKe
                     5
                 );
             } else {
-                $localOrder->save($order);//更新订单信息
-                //修改积分和贡献,yanglaojin值记录
-                $orderThird->updateJilu(
-                    $localOrder['uid'],
-                    $localOrder['order_sn'],
-                    5);
-                //修改养老金记录
+                if($localOrder['tk_status']!=$order['tk_status']) {
+                    log::info("=============更新订单");
+                    $localOrder->save($order);//更新订单信息
+                    //修改积分和贡献,yanglaojin值记录
+                    $orderThird->updateJilu(
+                        $localOrder['uid'],
+                        $localOrder['order_sn'],
+                        5);
+                }
+
             }
 
         }

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

@@ -487,7 +487,7 @@ class Jd extends BaseController
         ]);
         //自定义时间  每20分钟执行一次查询前半小时的数据
         if (!$time['startTime'] && !$time['endTime']) {
-            $time['startTime'] = date("Y-m-d H:i:s", strtotime("-20 minute"));
+            $time['startTime'] = date("Y-m-d H:i:s", strtotime("-200 minute"));
             $time['endTime'] = date('Y-m-d H:i:s');
         }
 //        var_dump($time);

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

@@ -620,13 +620,16 @@ class Jt extends BaseController
         ]);
 
         if (empty($time['startTime'])) {
-            $time['startTime'] = date('Y-m-d H:i:00', strtotime('-3minute'));
+            $time['startTime'] = date('Y-m-d H:i:00', strtotime('-30minute'));
             $time['endTime'] = date('Y-m-d H:i:00', strtotime('+1minute'));
         }
 //        if (empty($time['startTime'])) {
 //            $time['startTime'] = "2024-06-04 15:10:00";
 //            $time['endTime'] = "2024-06-04 15:55:00";
 //        }
+
+        log::info("===={$time['startTime']}+++");
+        log::info("===={$time['endTime']}+++");
         try {
             $url = 'http://japi.jingtuitui.com/api/get_order_row';
             $hasMore = false;
@@ -831,6 +834,11 @@ class Jt extends BaseController
 //            );
             } else {
                 $localOrder->save($order);//更新订单信息
+                //修改积分和贡献,yanglaojin值记录
+                $orderThird->updateJilu(
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    5);
             }
 
 

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

@@ -751,6 +751,7 @@ class Su extends BaseController
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = SuOrderModel::create($order);
+                log::
                 //预估养老金
                 $orderThird->yuguOrder(
                     $localOrder['order_su_id'],
@@ -767,7 +768,14 @@ class Su extends BaseController
                     3
                 );
             } else {
-                $localOrder->save($order);//更新订单信息
+                if($localOrder['status']!=$order['status']) {
+                    $localOrder->save($order);//更新订单信息
+                    //修改积分和贡献,yanglaojin值记录
+                    $orderThird->updateJilu(
+                        $localOrder['uid'],
+                        $localOrder['order_sn'],
+                        5);
+                }
             }
 
         }

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

@@ -376,8 +376,8 @@ class TaoKe extends BaseController
         log::info("===doGetPinDetail==={$goodsId}+======{$uid}");
         //获取商品详情
         $result = $this->doGetPinDetail($goodsId, $uid);
-        log::info("===doGetPinDetail");
-        log::info($result);
+        log::info("===doGetPinDetail=={$uid}");
+//        log::info($result);
         $log = [
             'flag' => '拼多多详情',
             'content' => json_encode($result,JSON_UNESCAPED_UNICODE),
@@ -627,7 +627,7 @@ class TaoKe extends BaseController
         //自定义时间 每20分钟执行一次查询前二十分钟的数据
         if (empty($data)) {
             $data = [
-                'startTime' => strtotime("-1000 minute"),
+                'startTime' => strtotime("-20 minute"),
                 'endTime' => time(),
             ];
         }
@@ -851,6 +851,8 @@ class TaoKe extends BaseController
             $type_shop = 1;
             log::info("pddsnsnsn==={$order['order_sn']}");
             $localOrder = PddOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
+            log::info("localOrder========");
+            log::info($localOrder);
             log::info("pddorder===");
             log::info($localOrder);
             if (empty($localOrder)) {
@@ -881,8 +883,18 @@ class TaoKe extends BaseController
 //                $localOrder['order_pdd_id']
 //            );
             } else {
-                if ($localOrder['pin_order_status'] != $order['pin_order_status']) {
+                if($localOrder['pin_order_status']!=$order['pin_order_status']) {
+                    log::info("=============更新订单");
                     $localOrder->save($order);//更新订单信息
+                    //修改积分和贡献,yanglaojin值记录
+                    $orderThird->updateJilu(
+                        $localOrder['uid'],
+                        $localOrder['order_sn'],
+                        5);
+                }
+
+                if ($localOrder['pin_order_status'] != $order['pin_order_status']) {
+
                 }
             }
 

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

@@ -2,8 +2,8 @@
 
 namespace app\controller\api\store\product;
 
-use app\common\model\system\admin\Log;
-use app\common\model\user\User;
+//use app\common\model\system\admin\Log;
+use think\facade\Log;
 use app\common\model\user\UserThird;
 use app\common\model\user\UserThirdOrder;
 use app\common\repositories\store\product\ProductRepository;
@@ -510,10 +510,20 @@ class Vip extends BaseController
         try{
             $uid = $this->request->uid();
         } catch (\Exception $e) {
+            g::info($e);
             $uid=0;
         }
         $param = $this->request->param(['goodsId']);
         $chanTag = $repository->getDetail(['uid' =>$uid, 'type' => 2], 'pid');
+        log::info("uid ={$uid}");
+        if(!$chanTag){
+            log::info("不存在");
+            $this->create_pid($uid);
+           $chanTag = $repository->getDetail(['uid' =>$uid, 'type' => 2], 'pid');
+        }
+        log::info("获取第三方pid");
+        log::info($chanTag);
+
         $apiName = 'com.vip.adp.api.open.service.UnionGoodsService';
         $params = [
             'goodsIdList' => [$param['goodsId']],
@@ -724,7 +734,7 @@ class Vip extends BaseController
                 'orderTimeEnd' => time() * 1000,
             ];
             */
-            $startTime = strtotime('-5minute') * 1000;
+            $startTime = strtotime('-50minute') * 1000;
             $endTime = time() * 1000;
             $type = ['order', 'update'];
             $orderList = [];
@@ -733,6 +743,9 @@ class Vip extends BaseController
                     "{$value}TimeStart" => $startTime,
                     "{$value}TimeEnd" => $endTime,
                 ];
+                log::info("====VIP 订单===");
+                log::info($params);
+
                 $result = $this->doOrderVip($params);
                 $result && $orderList[] = $result;
             }
@@ -765,6 +778,7 @@ class Vip extends BaseController
     //实际执行从vip拉取订单的方法
     public function doOrderVip(array $params)
     {
+
         $page = 1;
         $pageSize = 20;
         $queryModel = array_merge($params, [
@@ -777,6 +791,8 @@ class Vip extends BaseController
         do {
             $request = ['queryModel' => $queryModel];
             $result = $this->getUrlResult($apiName, "orderList", $request);
+            log::info("vip===返回订单数据");
+            log::info($result);
             $lists = $result['result']['orderInfoList'] ?? [];
             $countList = count($lists);
             if (!empty($countList)) {
@@ -784,7 +800,7 @@ class Vip extends BaseController
             }
             $page++;
         } while ($countList == $pageSize);
-        if (!empty($orderLists)) {
+                if (!empty($orderLists)) {
             //格式化从唯品会拉取的订单列表
             $formatLists = $this->formatOrderList($orderLists);
             //将唯品会订单进行处理
@@ -797,6 +813,7 @@ class Vip extends BaseController
     //格式化从拼多多拉取的订单列表
     public function formatOrderList($orderLists)
     {
+        log::info("====唯品会订单拉取=====");
         $user = app()->make(UserThirdRepository::class);
         $formatLists = [];
         foreach ($orderLists as $order) {
@@ -884,11 +901,23 @@ class Vip extends BaseController
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],
-                    $localOrder['bill_end_time'],
                     2
                 );
             } else {
-                $localOrder->save($order);//更新订单信息
+                log::info("lorder==={$localOrder['status']}====ooder+{$order['status']}");
+                if($localOrder['status']!=$order['status']){
+//                    log::info("进入修改lorder==={$localOrder['status']}======");
+//                    log::info("====ooder+{$order['status']}=======");
+                    //修改积分和贡献,yanglaojin值记录
+                    $orderThird->updateJilu(
+                        $localOrder['uid'],
+                        $localOrder['order_sn'],
+                        2);
+                    $localOrder->save($order);//更新订单信息
+
+                }
+
+
             }
         }
     }

route/api.php

@@ -822,9 +822,9 @@ Route::group('api/', function () {
     //获取拼多多商品详情
     Route::get('pdd/detail', 'api.store.product.TaoKe/pdd_detail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
     //唯品会商品详情
-    Route::get('vip/detail', 'api.store.product.Vip/vip_detail');
+    Route::get('vip/detail', 'api.store.product.Vip/vip_detail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
     //苏宁详情
-    Route::get('su/detail/:id', 'api.store.product.Su/goodsDetail');
+    Route::get('su/detail/:id', 'api.store.product.Su/goodsDetail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
     //抖音详情
     Route::get('dy/get_detail', 'api.store.product.Douyin/dy_detail');