Merge branch 'master' into huangfamily

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

@@ -982,7 +982,7 @@ class StoreOrderRepository extends BaseRepository
                             }
 
                         } else if (!empty($array_fzone_paytype['type'] == 'a1')) {
-                            //生活 VR支付
+                            //会员专区 VR支付
 
                             $user_data = Db::name("user")->where("uid", $uid)->find();
 
@@ -9363,6 +9363,13 @@ class StoreOrderRepository extends BaseRepository
         //如果是会员专区就即刻到账
         $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->find();
 
+        //查询支付方式
+        $array_fzone_paytype = json_decode($order_from_mer['fzone_paytype'],true);
+        $pay_type = 3;//默认是微信
+        if($array_fzone_paytype['note'] != "现金"){
+            $pay_type = 4;
+        }
+
         $sm_status = 0;//储存当前用户是否有实名的状态
 
         if ($order_from_mer['mer_id'] == 496) {
@@ -9381,13 +9388,48 @@ class StoreOrderRepository extends BaseRepository
 
                         $sm_status = 1;
                         $ds = 1;
-                        $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+                        Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+
+                        //添加养老金到公证处日志
+                        $ylj_data_log = [
+                            'user_name' => $get_cer_datas['user_name'],
+                            "mobile" => $get_cer_datas['mobile'],
+                            "user_card" => $get_cer_datas['user_card'],//身份证
+                            "pension" => $num,//养老金额度
+                            "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                            "order_type" => 2,//订单类型(2:)
+                            "pay_time" => date('Y-m-d H:i:s'),
+                            "create_time" => date('Y-m-d H:i:s'),
+                            "update_time" => date('Y-m-d H:i:s'),
+                            "uid" => $uid,
+                        ];
 
-                    } else {
-                        $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
-                    }
-                }
+                        Db::name('gzc_logs')->insert($ylj_data_log);
+
+                    } 
+                }else {
+                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
+
+                      //添加养老金到公证处日志
+                    $ylj_data_log = [
+                    //'user_name' => $get_cer_datas['user_name'],
+                    //"mobile" => $get_cer_datas['mobile'],
+                    //"user_card" => $get_cer_datas['user_card'],//身份证
+                    "pension" => $num,//养老金额度
+                    "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                    "order_type" => 2,//订单类型(2:)
+                    "pay_time" => date('Y-m-d H:i:s'),
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $uid,
+
+                    ];
 
+                    Db::name('gzc_logs')->insert($ylj_data_log);
+
+                }
 
             }
 

app/controller/admin/gong/Goods.php

@@ -105,8 +105,6 @@ class Goods extends BaseController
     // 获取选品库中全部、已加入3号库、未加入3号库的数量
     public function getStatusFilter()
     {
-   
-   
         // 获取全部数据
         $allNum =  Db::name('douhuomall')->whereIn('status', [0, 1])->count();
         // 获取已加入3号库的数据
@@ -116,21 +114,21 @@ class Goods extends BaseController
 
 
         $res = [
-            [
-                'type' => 0,
-                'title' => '全部',
-                'count' => $allNum
-            ],
-            [
-                'type' => 1,
-                'title' => '已加入3号库',
-                'count' => $joinNum
-            ],
-            [
-                'type' => 2,
-                'title' => '未加入3号库',
-                'count' => $notJoinNum
-            ]
+            // [
+            //     'type' => 0,
+            //     'title' => '全部',
+            //     'count' => $allNum
+            // ],
+            // [
+            //     'type' => 1,
+            //     'title' => '已加入3号库',
+            //     'count' => $joinNum
+            // ],
+            // [
+            //     'type' => 2,
+            //     'title' => '未加入3号库',
+            //     'count' => $notJoinNum
+            // ]
         ];
         return app('json')->success($res);
     }
@@ -277,7 +275,7 @@ class Goods extends BaseController
                 'spu_id'=>$data['spu_id'],
                 'temp_id' => 105,
                 'plate_mer_profit' => $data['mer_profit'],
-		'concession_pri' => $data['mer_profit'],
+		        'concession_pri' => $data['mer_profit'],
                 'yanglaojin_scale' => $yanglaojin_scale
             ];
             $insert_id=Db::name('store_product')->insertGetId($product_insert_data);

app/controller/api/Auth.php

@@ -449,7 +449,7 @@ class Auth extends BaseController
         if (!$account)
             return app('json')->fail('请输入账号');
         $user = $repository->accountByUser($this->request->param('phone'));
-        //13231658486 周总
+        //13231658486 周总 张玉庭 13839803521 13083849831
         if($account != 15528079265){
             if (!$user)
                 return app('json')->fail('账号或密码错误');
@@ -742,6 +742,13 @@ class Auth extends BaseController
         //积分
         $data['score']=set_price_rtrim($data['score']);
         //2025新增 贡献值，红包，京东，vr，复购金
+
+        if( $user['user_group'] <= 2 ){
+            $data['contribute'] =  $user['contribute'] + $user['per_contribute'];
+        }else{
+            $data['contribute'] =  $user['contribute'];
+        }
+
         $date['contribute']=set_price_rtrim($data['contribute']);//贡献值
         $data['repurchase_price']=set_price_rtrim($data['repurchase_price']);//复购余额
         $data['jingdou']=set_price_rtrim($data['jingdou']);//京豆

app/controller/api/Notify.php

@@ -1525,6 +1525,13 @@ class Notify
         //如果是会员专区就即刻到账
         $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->find();
 
+         //查询支付方式
+         $array_fzone_paytype = json_decode($order_from_mer['fzone_paytype'],true);
+         $pay_type = 3;//默认是微信
+         if($array_fzone_paytype['note'] != "现金"){
+             $pay_type = 4;
+         }
+
         $sm_status = 0;//储存当前用户是否有实名的状态
 
         if($order_from_mer['mer_id'] == 496){
@@ -1536,18 +1543,55 @@ class Notify
             //如果是会员区的养老金，查看是否有实名，如果实名就改变订单状态和user-bill的状态
             if($comm_order_type == 5){
 
+              
                 //当前用户是否有实名，然后改变user_bill和order_store的gzc状态
-                $get_cer_datas = Db::name('user_certification')->where("uid",$uid)->find();
-                if(!empty($get_cer_datas)){
-                    if(!empty($get_cer_datas['user_card'])){
+                $get_cer_datas = Db::name('user_certification')->where("uid", $uid)->find();
+                if (!empty($get_cer_datas)) {
+                    if (!empty($get_cer_datas['user_card'])) {
 
                         $sm_status = 1;
                         $ds = 1;
-                        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>1]);
-                       
-                    }else{
-                        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>0]);
-                    }
+                        Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+
+                        //添加养老金到公证处日志
+                        $ylj_data_log = [
+                            'user_name' => $get_cer_datas['user_name'],
+                            "mobile" => $get_cer_datas['mobile'],
+                            "user_card" => $get_cer_datas['user_card'],//身份证
+                            "pension" => $num,//养老金额度
+                            "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
+                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                            "order_type" => 2,//订单类型(2:)
+                            "pay_time" => date('Y-m-d H:i:s'),
+                            "create_time" => date('Y-m-d H:i:s'),
+                            "update_time" => date('Y-m-d H:i:s'),
+                            "uid" => $uid,
+                        ];
+
+                        Db::name('gzc_logs')->insert($ylj_data_log);
+
+                    } 
+                }else {
+                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
+
+                      //添加养老金到公证处日志
+                    $ylj_data_log = [
+                    //'user_name' => $get_cer_datas['user_name'],
+                    //"mobile" => $get_cer_datas['mobile'],
+                    //"user_card" => $get_cer_datas['user_card'],//身份证
+                    "pension" => $num,//养老金额度
+                    "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
+                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                    "order_type" => 2,//订单类型(2:)
+                    "pay_time" => date('Y-m-d H:i:s'),
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $uid,
+
+                    ];
+
+                    Db::name('gzc_logs')->insert($ylj_data_log);
+
                 }
 
                 

app/controller/api/douhuomall/Take.php

@@ -2,18 +2,257 @@
 namespace app\controller\api\douhuomall;
 
 use app\traits\GongApiRequest;
+use think\Exception;
+use think\facade\Db;
+use think\facade\Log;
 
 class Take
 {
 
     use GongApiRequest;
 
-    public function get(){
-        //spu_id列表
-        $spu_list = GongApiRequest::get_goods_list();
-        dump($spu_list);
+    public function get_goods_list(){
+        try {
+            set_time_limit(0);
+            $allData = [];
+            $page = 1;
+            $limit = 100;
+            $hasNextPage = true; // 是否有下一页的标志
+            while ($hasNextPage) {
+                $data = GongApiRequest::get_goods_list($page, $limit);
+                if (!$data) {
+                    break; // 如果请求失败，停止循环
+                }
+                $allData = array_merge($allData, $data['list']); // 数据在list键下
+                if (!count($data['list']) || count($data['list']) < $limit) {
+                    $hasNextPage = false; // 如果没有更多页面，停止循环
+                } else {
+                    $page++; // 增加页码数
+                }
+            }
 
+            $goods_id_list = [];
+            $spu_id_list = Db::name('douhuomall')->column('spu_id');
+         
+            // 同步到数据库
+            foreach ($allData as $key=>$value) {
+                sleep(1);
+                // if($key != 0) continue;
+                $goodsInfo = GongApiRequest::get_goods_info($value['goods_id']);
+                if(!$goodsInfo) continue;
+
+                //图片存放路径
+                $targetDir = public_path() . 'images/gong/'.$value['goods_id'].'/';
+
+                $this->deleteFilesInDirectory($targetDir);
+
+                //spuId_info商品详细信息处理
+                $goodsInfo['cover_url'] = $this->seveImg($value['goods_id'], $goodsInfo['main_img'], $targetDir);
+                $goodsInfo['spu_id'] = $goodsInfo['goods_id'];
+
+                $goodsInfo['detail'] = "";
+                $detail_img = $this->seveImg($value['goods_id'], $goodsInfo['detail_img'], $targetDir);
+                foreach($detail_img as $img_url){
+                    $img_url = "<img src='".$img_url."' />";
+                    $goodsInfo['detail'] = $goodsInfo['detail'].$img_url;
+                }
+
+                //sku信息处理
+                $skuInfo = $goodsInfo['sku_list'];
+                foreach ($skuInfo as $k=>$v) {
+                    $skuInfo[$k]['cost_price'] = bcadd($v['plat_price'], bcmul($v['plat_price'], 0.03, 2),2);//成本价格 原来进价的基础上加百分之3
+                    $skuInfo[$k]['market_price'] = bcadd($skuInfo[$k]['cost_price'], bcmul($skuInfo[$k]['cost_price'], 0.2, 2),2);//销售价格  售价在成本价格的基础上加百分20
+                    $skuInfo[$k]['profit'] = bcdiv($skuInfo[$k]['market_price'], $skuInfo[$k]['cost_price'], 2);
+                    $skuInfo[$k]['mer_profit'] = bcsub($skuInfo[$k]['market_price'], $skuInfo[$k]['cost_price'], 2);
+                    $skuInfo[$k]['yanglaojin'] = '0.00';
+                    if(count($v['attr'])){
+                        $skuInfo[$k]['attribute_json'] = $v['attr'];
+                    }else{
+                        $skuInfo[$k]['attribute_json'] = [['val'=> '默认', 'name'=> '默认']];
+                    }
+                }
+                unset($goodsInfo['sku_list']);
+
+                $seveData = [
+                    'spu_id' => $goodsInfo['spu_id'],
+                    'skuId_info' => $skuInfo,
+                    'sys_id' => '112',
+                    'goods_id' => $goodsInfo['goods_id'],
+                    'spuId_info' => $goodsInfo,
+                    'sku_id' => $skuInfo[0]['sku_id'] ? $skuInfo[0]['sku_id'] : 0,
+                    'status' => $goodsInfo['status'],
+                    'cate_ids' => $goodsInfo['cate_ids'],
+                    'title' => $goodsInfo['spu_name'],
+                    'cxb_cate_id' => 0,   
+                ];
+                $this->add($seveData);
+                $goods_id_list[] = $goodsInfo['spu_id'];
+            }
+
+            $goodsIds = array_diff($spu_id_list, $goods_id_list);
+            $this->remove($goodsIds);
+            return 'sussess';
+        } catch (Exception $e) {
+            Log::error('同步数据失败：' . $e->getMessage());
+            echo '供应链拉取数据：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】';
+            return 'error';
+        }
+    }
+
+    public function seveImg($goods_id, $img_url, $targetDir)
+    {
+        if (is_array($img_url)){
+            $new_img_url = [];
+            foreach ($img_url as $value) {
+                $new_img_url[] = $this->seveImgUrl($goods_id, $value, $targetDir);
+            }
+        }else{  
+            $new_img_url = $this->seveImgUrl($goods_id, $img_url, $targetDir);
+        }
+        return $new_img_url;
+    }
+
+    public function seveImgUrl($goods_id, $remoteImageUrl, $targetDir)
+    {
+        // 目标路径（确保目录存在）
+        $targetDirTow = rand(1000, 10000). $this->upImgName(basename($remoteImageUrl));
+        $targetPath = $targetDir . $targetDirTow; // 使用basename获取文件名
+        
+        // 检查目标目录是否存在，如果不存在则创建
+        if (!is_dir($targetDir)) {
+            mkdir($targetDir, 0777, true); // 第二个参数是权限，第三个参数是递归创建
+        }
+        
+        // 获取远程图片内容
+        $imageContent = file_get_contents($remoteImageUrl);
+        
+        // 检查是否成功获取内容
+        if ($imageContent !== false) {
+            // 保存图片到指定路径
+            if (file_put_contents($targetPath, $imageContent)) {
+                $new_img_url = env('APP_URL').'/images/gong/'.$goods_id.'/'. $targetDirTow;
+                return $new_img_url;
+            } else {
+                echo "保存图片时发生错误。";
+                return $remoteImageUrl;
+            }
+        } else {
+            echo "无法获取远程图片内容。";
+            return $remoteImageUrl;
+        }
     }
 
 
+    public function upImgName($filename)
+    {
+        $position = strpos($filename, '?');
+        if ($position !== false) {
+            $filename = substr($filename, 0, $position);
+        }
+        return $filename;
+    }
+
+    public function deleteFilesInDirectory($dir) {
+        if (!is_dir($dir)) return true;
+
+        // 打开目录
+        $files = scandir($dir);
+     
+        // 遍历目录中的所有文件
+        foreach ($files as $file) {
+            // 如果是文件（排除 . 和 ..）
+            if ($file !== '.' && $file !== '..') {
+                $filePath = $dir . '/' . $file;
+                // 删除文件
+                if (is_file($filePath)) {
+                    unlink($filePath);
+                }
+            }
+        }
+        return true;
+    }
+
+
+    public function add($data)
+    {
+        $findData = Db::name('douhuomall')->field('id,spu_id,status')->where('spu_id', $data['spu_id'])->find();
+        try {
+            $data['create_time'] = date('Y-m-d H:i:s');
+            $data['update_time'] = date('Y-m-d H:i:s');
+            $skuInfo = $this->arrSort($data['skuId_info'], 'cost_price', SORT_ASC);
+            $data['cost_price'] = isset($skuInfo[0]['cost_price']) ? $skuInfo[0]['cost_price'] : 0;
+            $data['market_price'] = isset($skuInfo[0]['market_price']) ? $skuInfo[0]['market_price'] : 0;
+            $data['ot_price'] = isset($skuInfo[0]['retail_price']) ? $skuInfo[0]['retail_price'] : 0;
+            $data['mer_profit'] = isset($skuInfo[0]['mer_profit']) ? $skuInfo[0]['mer_profit'] : 0;
+            $data['pension'] = isset($skuInfo[0]['yanglaojin']) ? $skuInfo[0]['yanglaojin'] : 0;
+            $data['profit'] = empty($data['cost_price']) || empty($data['market_price']) ? 0 : bcdiv($data['market_price'], $data['cost_price'], 2);
+            if (empty($findData)) {
+                $data['skuId_info'] = json_encode($data['skuId_info']);
+                $data['spuId_info'] = json_encode($data['spuId_info']);
+                Db::name('douhuomall')->insert($data);
+            } else {
+                Db::name('douhuomall')->where('spu_id', $findData['spu_id'])->update([
+                    'status' => $data['status'],
+                    'create_time' => date('Y-m-d H:i:s'),
+                    'update_time' => date('Y-m-d H:i:s'),
+                    'cost_price' => $data['cost_price'],
+                    'market_price' => $data['market_price'],
+                    'ot_price' => $data['ot_price'],
+                    'mer_profit' => $data['mer_profit'],
+                    'pension' => $data['pension'],
+                    'profit' => $data['profit'],
+                    'skuId_info' => json_encode($data['skuId_info']),
+                    'spuId_info' => json_encode($data['spuId_info']),
+                    'title' => $data['title'],
+                    'cate_ids' => $data['cate_ids'],
+                    'cxb_cate_id' => $data['cxb_cate_id']
+                ]);
+            }
+            return true;
+        } catch (Exception $e) {
+            echo '供应链产品添加：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】';
+            return false;
+        }
+    }
+    
+
+    public function remove($goodsIds)
+    {
+        Db::startTrans();
+        try{
+            // 删除选品库对应的数据
+            Db::name('douhuomall')->whereIn('spu_id', $goodsIds)->update([
+                'status' => 3,
+                'update_time' => date('Y-m-d H:i:s')
+            ]);
+            // 删除商品管理对应的数据
+            Db::name('store_product')->whereIn('spu_id', $goodsIds)->update([
+                'is_del' => 1,
+                'is_show' => 0
+            ]);
+            Db::commit();
+            return true;
+        } catch (Exception $e) {
+            Db::rollback();
+            Log::channel("gong")->error('供应链取消商品失败：' . $e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * 二维数组根据某个字段排序
+     * @param array $array 要排序的数组
+     * @param string $keys   要排序的键字段
+     * @param string $sort  排序类型  SORT_ASC     SORT_DESC
+     * @return array 排序后的数组
+     */
+    function arrSort($array, $keys, $sort = SORT_DESC) {
+        $keysValue = [];
+        foreach ($array as $k => $v) {
+            $keysValue[$k] = $v[$keys];
+        }
+        array_multisort($keysValue, $sort, $array);
+        return $array;
+    }
 }

app/controller/api/store/merchant/Taskorder.php

@@ -72,7 +72,7 @@ class Taskorder extends BaseController
     public function lst1()
     {
 
-       
+       return;
    
         // $user_datas = Db::name("user")->select();//星级等级
         // foreach($user_datas as $k=>$v){
@@ -89,76 +89,25 @@ class Taskorder extends BaseController
     
     //    var_dump($totalPv);return;    
     
-         $ss = $this->getbig_samll_datas(222);
-         var_dump($ss);    return;
+        // $sf = $this->getStarLevel(221);
+ //var_dump($sf);
+         // $ss = $this->getbig_samll_datas(221);//222
+
+          //$ff = $this->getPerformanceOf(221);
+         // var_dump($ff);
+    //var_dump($ss);   
+          // return;
       
      
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
        
         //$week_record = 45500 + 1400 + 60000; //20250218
         //$week_record =23800 + 60000; //20250222
-        $week_record =64400; //20250301
-   
+       // $week_record = 64400; //20250301
+        $week_record = 10500 + 50000; //20250310
     //return;
 
-       // $stock_comm = round($week_record * 0.05 ,2);
-     //var_dump($week_record);return;
-
-        // $team_small_big_amount = $this->getbig_samll_datas(17);//下标0是大部门，下标1是小部门
-        // var_dump($team_small_big_amount);return;
-
-
-        //获取股权分红的人
-       
-        // $GetAllUserPackNum = db::name("old_user_stock")->sum("pack");//计算所有用户的份数总和
-        
-        // $stockuserdatas = db::name("old_user_stock")->select();//获取所有用户
-       
-        // if(count($stockuserdatas) > 0){
-        //   $one_pack_comm_data = round($stock_comm / $GetAllUserPackNum,2);//获取每份的单佣金
-        
-        //     foreach ($stockuserdatas as &$v) {
-        //           $v['getcomm'] = $v['pack'] * $one_pack_comm_data;
-        //           $v['allgetcomm'] =  $v['allgetcomm'] + $v['getcomm'];
-        //           $v['update_time'] = time();
-                  
-        //           // 更新 user_stock 表中的记录
-        //           $res = db::name("old_user_stock")->where("id", $v['id'])->update([
-        //               'getcomm' => $v['getcomm'],
-        //               'allgetcomm' => $v['allgetcomm'],
-        //               'update_time' => $v['update_time']
-        //           ]);
-              
-        //           $res1 = Db::name("user")->where("id",$v['user_id'])->inc("total_amount_old",$v['getcomm'])->save();
-        //           $res2 = Db::name("user")->where("id",$v['user_id'])->inc("amount_old",$v['getcomm'])->save();
-                  
-        //        $res =true;
-        //           if($res){
-        //               $das = $this->change_user_log($v['user_id'],'amount_old',1,$v['getcomm'],"member_award_stock","股权分红入账"."-".$v['pack']);//释放佣金
-                    
-        //                 //入账星级分红记录表
-        //               $week_data = [];
-        //               $week_data['user_id'] =  $v['user_id'];
-        //               $week_data['user_star_id'] =  0;
-        //               $week_data['award_num'] =  0;
-        //               $week_data['award_num_sm'] =  0;
-        //               $week_data['remark'] =  "股权分红主动执行";
-        //               $week_data['week_record'] =  $week_record;
-        //               $week_data['all_amount'] =  $stock_comm;
-        //               $week_data['radio'] =  2;
-        //               $week_data['owner_bill'] =  0;  //总流水金额
-        //               $week_data['my_bill'] = 0;  //我的流水
-        //               $week_data['create_time'] = time();
-                      
-        
-        //               Db::name("old_user_weekaward")->insert($week_data);
-
-                         //$this->bill_user_log111111($v['user_id'],"股权分佣", $stock_comm,"股权明细入账");//股权分佣明细2.0系统
-        //           }
-                  
-        //     }
-        //   }
-        
+    
         //股权分红 end
     
        
@@ -251,7 +200,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
       
       //移动指定ID_end
    
-        // var_dump($sales_arr);die;
+         //var_dump($sales_arr);return;
       //$sales_arr获取分红的id和分红的比例 
 
 
@@ -334,21 +283,23 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
                $user_pv_small_num = $this->getpersamllcomm($v);//返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
                $my_mix_money = round($amont * ($user_pv_small_num[0]/$small_ow_bill),2);
 
-               $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();    
-               $datas_log = [
-        'note'=>"名称:".  $userdatassss['nick_name']  ." 用户:". $v . " 双联盟总业绩:" . $owner_bill ." 我的双区业绩:". $my_bill . " 小区总业绩:".$small_ow_bill." 我的业绩小的:" . $user_pv_small_num[0] . "  可分红佣金:" .$amont . "  可分红总佣金:" . $fs_money_nums . "  小区业绩可分红:" . $my_mix_money . " 大区业绩可分红:" .$my_weight_money,
-                'create_time'=>date('Y-m-d H:i:s')
-               ];
-               $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中    
 
-        
-//die;
                # code...
                $all_award = $my_weight_money + $my_mix_money; 
           
                //90%给佣金，10给复购金
                $yj_90 = $all_award * 0.9;
                $fg_10 = $all_award * 0.1;
+
+
+               
+               $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();    
+               $datas_log = [
+        'note'=>"名称:".  $userdatassss['nick_name']  ." 用户:". $v . " 双联盟总业绩:" . $owner_bill ." 我的双区业绩:". $my_bill . " 小区总业绩:".$small_ow_bill." 我的业绩小的:" . $user_pv_small_num[0] . "  可分红佣金:" .$amont . "  可分红总佣金:" . $fs_money_nums . "  小区业绩可分红:" . $my_mix_money . " 大区业绩可分红:" .$my_weight_money . " 实际分得:". $yj_90,
+                'create_time'=>date('Y-m-d H:i:s')
+               ];
+               $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中    
+
                # code...
                $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$yj_90)->save();
 
@@ -379,7 +330,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
 
 
                   $this->bill_user_log111111($v,"合伙人分佣",$yj_90,"合伙人分佣明细入账",11);//联创分佣明细2.0系统
-                  $this->fugou_user_log($v,$fg_10,11,1,1);//复购金明细入账
+                  $this->fugou_user_log($v,$fg_10,16,1,1);//复购金明细入账
               //}
           }
 
@@ -416,7 +367,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
             'number'=>$num,//数量
             'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
             'mark'=>"复购金",//备注
-            'desc'=>"抽取佣金的10%作为复购金",//描述
+            'desc'=>"10%复购金",//描述
             'order_id'=>$order_id,//订单id
             'surplus'=>0,//剩余
             'order_type'=>11,//关联订单ID
@@ -567,7 +518,7 @@ public function getWeekStartEnd()
 
 
           $person_money +=  $team_small_big_amount[1];
-          $team_money += $team_small_big_amount[0];
+         $team_money += $team_small_big_amount[0];
     
         //end
 
@@ -1205,7 +1156,7 @@ public function getbig_samll_datas($user_id) {
             //var_dump($result_small_team_arr);
             //获取当前用户下面在2.0中的下级所有PV
             $get_teams_per_pv = $this->getteampv($result_small_team_arr);
-           // var_dump($get_teams_per_pv);
+           // var_dump("小区业绩:" . $get_teams_per_pv);
             //获取当前用户在2.0中小区的业绩 end
 
         }else{
@@ -1247,15 +1198,28 @@ public function getbig_samll_datas($user_id) {
         // $person_amount = 0;
 
         if($user_id < 611){
-         
-            //获取当前用户直属下级(查询在2.0中直接推荐人和伞下的业绩。并比对大小部门)
-            //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
-            $b_s = $this->getparents_child_pv11($user_id,$get_teams_comm_pv, $get_teams_per_pv);
+            //如果当前用户直推，在2.0没有下级就不用再调用这个方法了
+            $getchild = db::name("user")->where("spread_uid",$user_id)->select();
+
+           
+            if(count($getchild) > 0){
+                //获取当前用户直属下级(查询在2.0中直接推荐人和伞下的业绩。并比对大小部门)
+                //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
+                $b_s = $this->getparents_child_pv11($user_id,$get_teams_comm_pv, $get_teams_per_pv);
+                
+                //var_dump( $b_s);echo "yyyyyyyyyyyyy";
+               
+                    $get_teams_comm_pv = $b_s[0];
+                    $get_teams_per_pv = $b_s[1];
+           
             
-            //var_dump( $b_s);echo "yyyyyyyyyyyyy";
-            $get_teams_comm_pv = $b_s[0];
-            $get_teams_per_pv = $b_s[1];
+            }
+         
+         
+        }
 
+        if($user_id == 523){
+            $get_teams_per_pv += 7000;
         }
 
    

app/controller/api/store/merchant/Taskorderguquan.php

@@ -32,7 +32,9 @@ class Taskorderguquan extends BaseController
 
         //$week_record = 23800 + 60000;//20250222
 
-        $week_record = 64400;//20250303
+       // $week_record = 64400;//20250303
+
+        $week_record = 10500 + 50000; //20250310
 
         $stock_comm = round($week_record * 0.05 ,2);
 
@@ -61,11 +63,11 @@ class Taskorderguquan extends BaseController
                     'update_time' => $v['update_time']
                 ]);
 
-               Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price", $yj_90)->save();
-               $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old", $yj_90)->save();
-               $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old", $yj_90)->save();
+              Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price", $yj_90)->save();
+              $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old", $yj_90)->save();
+              $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old", $yj_90)->save();
 
-               $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
+              $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
 
                 $res =true;
                 if($res){
@@ -77,7 +79,7 @@ class Taskorderguquan extends BaseController
                     $week_data['user_star_id'] =  0;
                     $week_data['award_num'] =  0;
                     $week_data['award_num_sm'] =  0;
-                    $week_data['remark'] =  "股权分红主动执行";
+                    $week_data['remark'] =  "股权分红主动执行" . $yj_90;
                     $week_data['week_record'] =  $week_record;
                     $week_data['all_amount'] =  $stock_comm;
                     $week_data['radio'] =  2;
@@ -99,7 +101,7 @@ class Taskorderguquan extends BaseController
 
                     $this->bill_user_log111111($v['user_id'],"股权分佣",  $yj_90,"股权明细入账",13);//股权分佣明细2.0系统
 
-                    $this->fugou_user_log($v['user_id'],$fg_10,11,1,1);//复购金明细入账
+                    $this->fugou_user_log($v['user_id'],$fg_10,16,1,1);//复购金明细入账
                 }
             }
         }
@@ -121,7 +123,7 @@ class Taskorderguquan extends BaseController
             'number'=>$num,//数量
             'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
             'mark'=>"复购金",//备注
-            'desc'=>"抽取佣金的10%作为复购金",//描述
+            'desc'=>"10%作为复购金",//描述
             'order_id'=>$order_id,//订单id
             'surplus'=>0,//剩余
             'order_type'=>11,//关联订单ID

app/controller/api/store/merchant/Taskorderlianc.php

@@ -299,7 +299,9 @@ class Taskorderlianc extends BaseController
 
        // $week_record = 45500 + 1400 + 60000;
         //$week_record = 23800 +60000;
-        $week_record = 64400;//20250303
+       // $week_record = 64400;//20250303
+
+        $week_record = 10500 + 50000; //20250310
 
         $originator_award = round(($week_record * 0.05),2);
 
@@ -382,7 +384,7 @@ class Taskorderlianc extends BaseController
                     $week_data['user_id'] =  $v;
                     $week_data['user_lianc_id'] =  $value['id'];
                     $week_data['money'] =  $yj_90;
-                    $week_data['remark'] =  "联创分红入账主动执行";
+                    $week_data['remark'] =  "联创分红入账主动执行" . $yj_90;
                     $week_data['all_record'] =  $originator_award;
                     $week_data['all_amount'] =  $distribution_money;
                     $week_data['create_time'] = time();
@@ -396,7 +398,7 @@ class Taskorderlianc extends BaseController
                     Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
                     $this->bill_user_log111111($v,"联创分佣", $yj_90,"联创明细入账",12);//股权分佣明细2.0系统
                     
-                    $this->fugou_user_log($v,$fg_10,11,1,1);//复购金明细入账
+                    $this->fugou_user_log($v,$fg_10,16,1,1);//复购金明细入账
 
                 }else {
                     // ..
@@ -420,7 +422,7 @@ class Taskorderlianc extends BaseController
                 'number'=>$num,//数量
                 'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
                 'mark'=>"复购金",//备注
-                'desc'=>"抽取佣金的10%作为复购金",//描述
+                'desc'=>"10%作为复购金",//描述
                 'order_id'=>$order_id,//订单id
                 'surplus'=>0,//剩余
                 'order_type'=>11,//关联订单ID

app/controller/api/user/User.php

@@ -254,10 +254,18 @@ class User extends BaseController
             
            // $getteamscon = $this->getPerformance($user->uid);
 
-            $getcon = $this->getPerformance_getcon( $user->uid);
+            //$getcon = $this->getPerformance_getcon( $user->uid);
+
+            $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
 
             //我的团队贡献值
-            $data['team_gongxian_num'] = $getcon['common_nums_pv'] + $getcon['person_nums_pv'];
+            if( $con['user_group'] <= 2 ){
+                $data['team_gongxian_num'] =  $team_userinfo_old_jbp22['person_nums_pv'] - $con['per_contribute'];
+            }else{
+                $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'];
+            }
+
+           
 
             //为生贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');
@@ -1406,17 +1414,27 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 454;//593
+             $teamid = 17;//593
+
+//            // $ss=  $this->userupdates($teamid);
+//            // var_dump($ss);
+
+ //$team_userinfo_old_jbp22 = $this->getPerformance22(17);
+
+ //$datas_jbp = Db::name('user')->where("status",1)->select();
+
+ //var_dump( $team_userinfo_old_jbp22['person_nums_pv']);
+
+// foreach($datas_jbp as $k=>$v){
+//     $team_userinfo_old_jbp22 = $this->getPerformance22($v['uid']);
+//     var_dump("id:" . $v['uid'] . "  用户:" . $v['nickname'] . "    小部门贡献值 :" .  $team_userinfo_old_jbp22['person_nums_pv']);
+// }
 
-           // $ss=  $this->userupdates($teamid);
-           // var_dump($ss);
-    $team_userinfo_old_jbp22 = $this->getPerformance22($teamid);
- var_dump( $team_userinfo_old_jbp22);
  return;
-                $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
+//                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
 
-           //return;
-              var_dump($team_userinfo_old_jbp1);return;
+//            //return;
+//               var_dump($team_userinfo_old_jbp1);return;
         }
 
 
@@ -1437,7 +1455,7 @@ class User extends BaseController
         ];
 
         // 如果在旧系统中有数据
-       //if (!empty($datas_jbp)) {
+     
             $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
             $tes = $this->teamPeople($teamid, $type); // 1:团队, 2:个人
 
@@ -1494,7 +1512,7 @@ class User extends BaseController
             $data['common_nums'] = $team_userinfo_old_jbp1['person_nums'];
             $data['common_nums_pv'] = max($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
             $data['person_nums_pv'] = min($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
-       // }
+      
 return app("json")->success($data);
 // // 查询当前会员旗下的会员数据（分页）
 //         [$page, $limit] = $this->getPage();
@@ -3944,7 +3962,7 @@ return app("json")->success($data);
 
         $team_amount = 0;
         $person_amount = 0;
-        $user_id = 454; //598 523 536
+       // $user_id = 17; //598 523 536
         
         $result_big_team_arr = [];
         $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
@@ -4079,7 +4097,7 @@ return app("json")->success($data);
            // $get_teams_per_pv = $this->getteampv($result_small_team_arr);
            $t_pv = $this->getteampv($result_small_team_arr);
            $get_teams_per_pv =$t_pv['totalPv'];
-            //var_dump(  $get_teams_per_pv);
+           //var_dump(  $get_teams_per_pv);
           
        
         

app/controller/merchant/gong/Goods.php

@@ -275,7 +275,7 @@ class Goods extends BaseController
                 'spu_id'=>$data['spu_id'],
                 'temp_id' => 105,
                 'plate_mer_profit' => $data['mer_profit'],
-		'concession_pri' => $data['mer_profit'],
+		        'concession_pri' => $data['mer_profit'],
                 'yanglaojin_scale' => $yanglaojin_scale
             ];
             $insert_id=Db::name('store_product')->insertGetId($product_insert_data);

app/traits/GongApiRequest.php

@@ -19,7 +19,7 @@ trait GongApiRequest
     private static $mobile = '17855366921';
 
     public static function get_access_token(){
-        $url = '/api/noAuth/access_token';
+        $url = '/api_v2/noAuth/getAccessToken';
         $time = time();
         $body = [
             'app_id' => self::$app_id,
@@ -37,7 +37,7 @@ trait GongApiRequest
 
     public static function access_token(){
         $gong_access_token = Cache::get('gong_access_token');
-        $url = '/api/category/get_list';
+        $url = '/api_v2/Goods/getGoodsList';
         $body = ['access_token' => $gong_access_token];
         $res = self::curl_post(self::$path.$url,$body);
         if(!$gong_access_token || ($res['error_code'] == 1001)){
@@ -47,7 +47,7 @@ trait GongApiRequest
         return $gong_access_token;
     }
 
-    //分类
+    //分类(未更改)
     public static function get_category(){
         $url = '/api/category/get_list';
         $body = [
@@ -72,7 +72,7 @@ trait GongApiRequest
      * @created 2022年5月19日11:31:59
      */
     public static function get_goods_list($page=1,$limit=50){
-        $url = '/api/goods/get_spuid_list';
+        $url = '/api_v2/Goods/getGoodsList';
         $body = [
             'access_token' => self::access_token(),
             'page' => $page,
@@ -87,16 +87,16 @@ trait GongApiRequest
 
     /**
      * 商品详情
-     * @param array $spu_id 商品spu_id
+     * @param array $goods_id 商品goods_id
      * @return array|boolean
      * @author lin
      * @created 2022年5月19日11:31:59
      */
-    public static function get_goods_info($spu_id){
-        $url = '/api/goods/get_spuId_info';
+    public static function get_goods_info($goods_id){
+        $url = '/api_v2/Goods/getGoodsDetail';
         $body = [
             'access_token' => self::access_token(),
-            'spu_id' => $spu_id,
+            'goods_id' => $goods_id,
         ];
         $res = self::curl_post(self::$path.$url,$body);
         if ($res['error_code'] == 2001) {
@@ -108,18 +108,42 @@ trait GongApiRequest
         return false;
     }
 
+
+
+    /**
+     * 规格详情
+     * @param array $sku_id 商品sku_id
+     * @return array|boolean
+     * @author lin
+     * @created 2022年5月19日11:31:59
+     */
+    public static function get_sku_detail($sku_id){
+        $url = '/api_v2/Goods/getSkuDetail';
+        $body = [
+            'access_token' => self::access_token(),
+            'sku_id' => $sku_id,
+        ];
+        $res = self::curl_post(self::$path.$url,$body);
+        echo json_encode($res);
+        if($res['error_code'] == 0){
+            return $res['result'];
+        }
+        return false;
+    }
+
+
     /**
      * 商品规格
-     * @param array $spu_id 商品spu_id
+     * @param array $sku_sn 商品sku_sn
      * @return array|boolean
      * @author lin
      * @created 2022年5月19日11:31:59
      */
-    public static function get_sku($spu_id){
-        $url = '/api/goods/get_skuId_info';
+    public static function get_sku($sku_sn){
+        $url = '/api/Goods/getSkuDetail';
         $body = [
             'access_token' => self::access_token(),
-            'spu_id' => $spu_id
+            'sku_sn' => $sku_sn
         ];
         $res = self::curl_post(self::$path.$url,$body);
         if($res['error_code'] == 0){
@@ -127,9 +151,10 @@ trait GongApiRequest
         }
         return false;
     }
+    
 
     /**
-     * 商品价格
+     * 商品价格(未更改)
      * @param string $sku_id 商品skuid,[‘984783’,’984784’]
      * @return array|boolean
      * @author lin
@@ -149,7 +174,7 @@ trait GongApiRequest
     }
 
     /**
-     * 商品是否有货
+     * 商品是否有货(未更改)
      * @param int $sku_id 商品sku_id
      * @param int $address_id 地址id（区id或者接到id）
      * @param int $goods_num 商品数量
@@ -173,7 +198,7 @@ trait GongApiRequest
     }
 
     /**
-     * 查询商品上下架
+     * 查询商品上下架(未更改)
      * @param string $spu_id 商品spu_id
      * @return array|boolean
      * @author lin
@@ -201,7 +226,7 @@ trait GongApiRequest
      * @created 2022年5月19日11:46:54
      */
     public static function sku_stock(string $sku_list, int $address_id){
-        $url = '/api/goods/find_sku_stock';
+        $url = '/api_v2/Goods/stock';
         $body = [
             'access_token' => self::access_token(),
             'sku_list' => $sku_list,
@@ -215,19 +240,19 @@ trait GongApiRequest
     }
 
     /**
-     * 运费查询（下单前调用，确定可售）
+     * 运费查询（下单前调用，确定可售） (未对接)
      * @param string $address_id 地址id
-     * @param array $sku_id sku列表 [{‘sku_id’:80,‘num’:5},{‘sku_id’:81,‘num’:2}]
+     * @param array $sku_list sku列表 [{‘sku_id’:80,‘num’:5},{‘sku_id’:81,‘num’:2}]
      * @return array|boolean
      * @author lin
      * @created 2022年5月19日11:46:54
      */
-    public static function freight(string $address_id, array $sku_id){
-        $url = '/api/order/freight';
+    public static function freight(string $address_id, array $sku_list){
+        $url = '/api_v2/order/getFreightPrice';
         $body = [
             'access_token' => self::access_token(),
             'address_id' => $address_id,
-            'sku_list' => $sku_id
+            'sku_list' => $sku_list
         ];
         $res = self::curl_post(self::$path.$url,$body);
         if($res['error_code'] == 0){
@@ -239,7 +264,7 @@ trait GongApiRequest
     /**
      * 正式下单
      * @param string $address_id 地址id
-     * @param array $sku_id sku列表 [{‘sku_id’:80,‘num’:5},{‘sku_id’:81,‘num’:2}]
+     * @param array $sku_list sku列表 [{‘sku_id’:80,‘num’:5},{‘sku_id’:81,‘num’:2}]
      * @param string $address 详细地址
      * @param string $third_order 订单id
      * @param string $other 备注
@@ -249,17 +274,17 @@ trait GongApiRequest
      * @author lin
      * @created 2022年5月19日13:22:09
      */
-    public static function submit(string $address_id, array $sku_id, string $address, string $third_order, string $other, string $receiver, string $receiver_phone){
-        $url = '/api/order/submit';
+    public static function submit(string $address_id, array $sku_list, string $address, string $third_order, string $other, string $receiver, string $receiver_phone){
+        $url = '/api_v2/order/submit';
         $body = [
             'access_token' => self::access_token(),
             'address_id' => $address_id,
-            'sku_list' => $sku_id,
+            'sku_list' => $sku_list,
+            'receiver' => $receiver,
+            'receiver_phone' => $receiver_phone,
             'address' => $address,
-            'third_order' => $third_order,
             'other' => $other,
-            'receiver' => $receiver,
-            'receiver_phone' => $receiver_phone
+            'third_order' => $third_order
         ];
 //        Db::name('log')->insert(['data'=>'供应链发货-------2：']);
         $res = self::curl_post(self::$path.$url,$body);
@@ -267,7 +292,7 @@ trait GongApiRequest
     }
 
     /**
-     * 手动发货
+     * 手动发货(未对接)
      * @param string $out_order_no 订单编号
      * @param string $logistics_number 物流单号
      * @param string $logistics_company 物流名称
@@ -291,7 +316,7 @@ trait GongApiRequest
     }
 
     /**
-     * 查询订单状态
+     * 查询订单状态(未对接)
      * @param string $out_order_no 订单编号
      * @return string|boolean 订单状态值 0失败 1待付款 2待发货 3待收货 4已完成 5已取消 6售后中 7售后完成8拒收
      * @author lin
@@ -318,7 +343,7 @@ trait GongApiRequest
      * @created 2022年5月19日11:46:54
      */
     public static function order_details(string $out_order_no){
-        $url = '/api/order/details';
+        $url = '/api_v2/order/getOrderDetail';
         $body = [
             'access_token' => self::access_token(),
             'out_order_no' => $out_order_no,
@@ -338,7 +363,7 @@ trait GongApiRequest
      * @created 2022年5月19日11:46:54
      */
     public static function order_track(string $out_order_no){
-        $url = '/api/order/track';
+        $url = '/api_v2/order/track';
         $body = [
             'access_token' => self::access_token(),
             'out_order_no' => $out_order_no,
@@ -352,7 +377,7 @@ trait GongApiRequest
 
 
     /**
-     * 确认收货
+     * 确认收货(未对接)
      * @param string $out_order_no 订单编号
      * @return array|boolean
      * @author lin
@@ -372,14 +397,14 @@ trait GongApiRequest
     }
 
     /**
-     * 查询商品是否可售后属性
+     * 查询商品是否可售后属性(未对接)
      * @param string $out_order_no 订单编号
      * @return array|boolean
      * @author lin
      * @created 2022年5月19日11:46:54
      */
     public static function after_is_can(string $out_order_no){
-        $url = '/api/after/is_can   ';
+        $url = '/api/after/is_can';
         $body = [
             'access_token' => self::access_token(),
             'out_order_no' => $out_order_no,
@@ -392,7 +417,7 @@ trait GongApiRequest
     }
 
     /**
-     * 申请售后
+     * 申请售后(未对接)
      * @param string $out_order_no 订单编号
      * @param string $customer_expect 1-退货。2-换货
      * @param string $question_desc 申请理由
@@ -417,7 +442,7 @@ trait GongApiRequest
     }
 
     /**
-     * 申请售后
+     * 申请售后(未对接)
      * @param string $order_goods_id 订单商品id
      * @param string $out_order_no 系统订单号
      * @param string $after_type 1=未收货退款，2=退货退款，3=换货补发，4=不退货仅退款
@@ -443,7 +468,7 @@ trait GongApiRequest
 
 
     /**
-     * 查询订单是否可售后
+     * 查询订单是否可售后(未对接)
      * @param string $out_order_no 系统订单号
      * @return mixed|string
      */
@@ -459,7 +484,7 @@ trait GongApiRequest
     }
 
     /**
-     * 售后订单状态
+     * 售后订单状态(未对接)
      * @param string $after_sn 售后订单号
      * @return array|boolean
      */
@@ -474,7 +499,7 @@ trait GongApiRequest
     }
 
     /**
-     * 售后订单状态
+     * 售后订单状态(未对接)
      * @param string $after_sn 售后订单号
      * @return array|boolean
      */
@@ -489,7 +514,7 @@ trait GongApiRequest
     }
 
     /**
-     * 退换货发货信息
+     * 退换货发货信息(未对接)
      * @param string $after_sn 售后订单编号。申请售后接口返回
      * @param string $logistics_company 1-退货。2-换货
      * @param string $logistics_number 申请理由
@@ -513,7 +538,7 @@ trait GongApiRequest
     }
 
     /**
-     * 取消申请售后
+     * 取消申请售后(未对接)
      * @param string $after_sn 售后订单编号。申请售后接口返回
      * @param string $out_order_no 订单编号
      * @return string|boolean
@@ -535,7 +560,7 @@ trait GongApiRequest
     }
 
     /**
-     * 获取地区
+     * 获取地区(未对接)
      * @param string $code 地区代码，为空查询省级信息，否则查询code的下级
      * @return string|boolean
      * @author lin
@@ -555,7 +580,7 @@ trait GongApiRequest
     }
 
     /**
-     * 获取消息池消息
+     * 获取消息池消息(未对接)
      * @param int $type 1-订单状态变动, 2-商品详情, 3-sku价格, 4-商品删除, 5-规格状态变更, 6-规格删除, 7-规格详情, 8-商品状态变更
      * @return  array|boolean
      * @author lin

route/api.php

@@ -1210,6 +1210,8 @@ Route::group('api/', function () {
     Route::get('close_seckill','api.warehouse.Product/close_seckill');//每小时 执行关闭秒杀任务
     Route::post('send_order/:id','api.douhuomall.Order/send_order');//测试下单 供应链
 
+    Route::get('get_goods_list','api.douhuomall.Take/get_goods_list');//测试拉去唯微宝商品
+
     Route::get('pay_demo', 'api.merchant.sxy.Access/pay_demo');
 
     Route::get('refund_test', 'api.store.order.StoreOrder/refund_test');//首信易测试订单退款