3

app/Http/Controllers/BaseController.php

@@ -128,7 +128,7 @@ class BaseController extends Controller
 
     public function test()
     {
-        $data = JutuikeUtil::getActList();
+        $data = JutuikeUtil::transferAct(123,42);
         return $this->success($data);
 //        $url = "https://mobile.yangkeduo.com/goods.html?_wvx=10&refer_share_uin=RKJBZMVHVOZWU3HQPZYUD5MAEQ_GEXDA&refer_share_uid=5985443220&share_uin=RKJBZMVHVOZWU3HQPZYUD5MAEQ_GEXDA&page_from=23&_wv=41729&refer_share_id=vJXEDkANGEc4uvPW9QgRCHPj3P6GELOc&refer_share_channel=copy_link&share_uid=5985443220&pxq_secret_key=EUEHP3OMNH3X4GQUAL37HDD7UJBLLM3OD42X55VHLGG6GT3EBPLQ&goods_id=276748200008";
         $url = "https://mobile.yangkeduo.com/goods.html?_wvx=10&refer_share_uin=QKZTKYYF4LYNCB7SVBSL42IYWY_GEXDA&refer_share_uid=3669222324&share_uin=QKZTKYYF4LYNCB7SVBSL42IYWY_GEXDA&page_from=101&_wv=41729&refer_share_id=l6x0HEi8EMpQ2F9CJiCmsW1IqO5fnT3K&refer_share_channel=copy_link&share_uid=3669222324&pxq_secret_key=6T5MOY4WIDK2ALUXMKACS7QZ3CEYWBUQRZATVA5T5PDULJS3CV6A&goods_id=169921843493";

app/Http/Controllers/Home/HomeController.php

@@ -165,12 +165,17 @@ class HomeController extends BaseController
      *              @SWG\Property(
      *                  property="url",
      *                  type="string",
-     *                  description="链接或者小程序首页"
+     *                  description="h5链接"
      *              ),
      *              @SWG\Property(
      *                  property="app_id",
      *                  type="string",
      *                  description="小程序appID"
+     *              ),
+     *              @SWG\Property(
+     *                  property="page_path",
+     *                  type="string",
+     *                  description="小程序路径"
      *              )
      *          )
      *     ),
@@ -183,13 +188,7 @@ class HomeController extends BaseController
      */
     public function getTransferLinkurl($userId, $actId)
     {
-//        dd(request()->getHost());
-        $url = HomeLogic::getTransferLink($actId,$userId);
-        $data = [
-            "type"=>1,
-            "url"=>$url,
-            "app_id"=>""
-        ];
+        $data = HomeLogic::getTransferLink($actId,$userId);
         return $this->success($data);
     }
 }

app/Http/Logic/Home/HomeLogic.php

@@ -113,99 +113,130 @@ class HomeLogic extends BaseLogic
         $linkUrl = env("INDEX_BASE_URL");
 
         $instance->info("基础地址:".$linkUrl);
+
+        $data = [
+            "type"=>1,
+            "url"=>$linkUrl,
+            "app_id"=>"",
+            "page_path"=>""
+        ];
+
         try{
             //获取用户
             switch ($act["platform_type"]){
                 case 1://淘宝
 
                     break;
-                case 2://拼多多
-                    $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_PINGDUODUO,$userId);
-                    //判断类型
-                    switch ($act["category_name"]){
-                        case "话费充值":
-                            $bean = new ResourceUrlGenParamBean(
-                                [
-                                    "pid"=>$platformSid,
-                                    "resourceType"=>39997
-                                ]
-                            );
-                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
-                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
-                            break;
-                        case "火车票":
-                            $bean = new ResourceUrlGenParamBean(
-                                [
-                                    "pid"=>$platformSid,
-                                    "resourceType"=>50005
-                                ]
-                            );
-                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
-                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
-                            break;
-                        case "百亿补贴":
-                            $bean = new ResourceUrlGenParamBean(
-                                [
-                                    "pid"=>$platformSid,
-                                    "resourceType"=>39996
-                                ]
-                            );
-                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
-                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
-                            break;
-                        case "领券中心":
-                            $bean = new ResourceUrlGenParamBean(
-                                [
-                                    "pid"=>$platformSid,
-                                    "resourceType"=>40000
-                                ]
-                            );
-                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
-                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
-                            break;
-                    }
-
-
-                    break;
-                case 3://京东
+//                case 2://拼多多
+//                    $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_PINGDUODUO,$userId);
+//                    //判断类型
+//                    switch ($act["category_name"]){
+//                        case "话费充值":
+//                            $bean = new ResourceUrlGenParamBean(
+//                                [
+//                                    "pid"=>$platformSid,
+//                                    "resourceType"=>39997
+//                                ]
+//                            );
+//                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
+//                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
+//                            break;
+//                        case "火车票":
+//                            $bean = new ResourceUrlGenParamBean(
+//                                [
+//                                    "pid"=>$platformSid,
+//                                    "resourceType"=>50005
+//                                ]
+//                            );
+//                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
+//                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
+//                            break;
+//                        case "百亿补贴":
+//                            $bean = new ResourceUrlGenParamBean(
+//                                [
+//                                    "pid"=>$platformSid,
+//                                    "resourceType"=>39996
+//                                ]
+//                            );
+//                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
+//                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
+//                            break;
+//                        case "领券中心":
+//                            $bean = new ResourceUrlGenParamBean(
+//                                [
+//                                    "pid"=>$platformSid,
+//                                    "resourceType"=>40000
+//                                ]
+//                            );
+//                            $data = DuoDuoKeUtil::resourceUrlGen($bean);
+//                            $linkUrl = $data["resource_url_response"]["single_url_list"]["short_url"];
+//                            break;
+//                    }
+//
+//
+//                    break;
+//                case 3://京东
+//
+//                    break;
+//                case 4://美团
+//                    switch ($act["category_name"]){
+//                        case "美团外卖":
+//                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
+//                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
+//                            break;
+//                        case "美团闪购":
+//                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
+//                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
+//                            break;
+//                        case "美团优选":
+//                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
+//                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
+//                            break;
+//                        case "美团酒店":
+//                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
+//                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
+//                            break;
+//                        default:
+//                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_JUTUIKE,$userId);
+//                            $linkUrl = JutuikeUtil::transferAct($platformSid,$act["activity_id"]);
+//                            break;
+//                    }
+//                    break;
+//                case 5://本平台
 
                     break;
-                case 4://美团
-                    switch ($act["category_name"]){
-                        case "美团外卖":
-                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
-                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
-                            break;
-                        case "美团闪购":
-                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
-                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
-                            break;
-                        case "美团优选":
-                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
-                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
-                            break;
-                        case "美团酒店":
-                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_MEITUAN,$userId);
-                            $linkUrl = MeituanLianmengUtil::getMeituanWaimaiUrl($userId,$platformSid,$act["activity_id"],MeiTuanLinkTypeEnum::H5);
-                            break;
-                        default:
-                            $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_JUTUIKE,$userId);
-                            $linkUrl = JutuikeUtil::transferAct($platformSid,$act["activity_id"]);
-                            break;
-                    }
+                case 6://聚推客
+                    $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_JUTUIKE,$userId);
+                    $data = JutuikeUtil::transferAct($platformSid,$act->activity_id);
                     break;
-                case 5://本平台
+            }
 
+            switch ($act["url_type"]){
+                case 1://h5链接
+                    $data = [
+                        "type"=>1,
+                        "url"=>$data["h5"],
+                        "app_id"=>$data["we_app_info"]["app_id"],
+                        "page_path"=>$data["we_app_info"]["page_path"]
+                    ];
                     break;
-                case 6://聚推客
-                    $platformSid = BaseUtil::getPlatformUserSpreadId(PlatformTypeEnum::PLATFORM_JUTUIKE,$userId);
-                    $linkUrl = JutuikeUtil::transferAct($platformSid,$act->activity_id);
+                case 2://小程序跳转
+                    $data = [
+                        "type"=>2,
+                        "url"=>$data["h5"],
+                        "app_id"=>$data["we_app_info"]["app_id"],
+                        "page_path"=>$data["we_app_info"]["page_path"]
+                    ];
                     break;
             }
-        }catch (\Throwable $exception){}
+        }catch (\Throwable $exception){
+
+        }
+
+
 
-        $linkUrl = $linkUrl?$linkUrl:env("INDEX_BASE_URL");
-        $instance->info("回调地址:".$linkUrl);
-        return $linkUrl;
+//        $linkUrl = $linkUrl?$linkUrl:env("INDEX_BASE_URL");
+//        $instance->info("回调地址:".$linkUrl);
+        return $data;
     }
 }

app/Http/Utils/Jutuike/JutuikeUtil.php

@@ -93,7 +93,7 @@ class JutuikeUtil extends BaseUtil
         $val = self::getCacheFromRedis($key);
         if($val){
             $instance->info("缓存中获取:".$val);
-            return $val;
+            return json_decode($val,true);
         }
         $url = self::$baseUrl."union/act";
         $params = [
@@ -110,8 +110,8 @@ class JutuikeUtil extends BaseUtil
             $instance->info("上游返回数据:".json_encode($res));
             throw new CommonException(ErrorEnum::ERROR_TRANS_LINK);
         }
-        $val = $res["data"]["h5"];
-        self::setRedisCache($key,$val,0);
+        $val = $res["data"];
+        self::setRedisCache($key,json_encode($val),0);
         return $val;
     }