From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容

---
 src/main/java/com/yeshi/buwan/pptv/PPTVApiUtil.java |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/pptv/PPTVApiUtil.java b/src/main/java/com/yeshi/buwan/pptv/PPTVApiUtil.java
index 69ba9e7..bdac890 100644
--- a/src/main/java/com/yeshi/buwan/pptv/PPTVApiUtil.java
+++ b/src/main/java/com/yeshi/buwan/pptv/PPTVApiUtil.java
@@ -1,9 +1,11 @@
 package com.yeshi.buwan.pptv;
 
 import com.google.gson.Gson;
+import com.yeshi.buwan.pptv.entity.PPTVProgram;
 import com.yeshi.buwan.pptv.entity.PPTVSeries;
 import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.util.TimeUtil;
+import com.yeshi.buwan.util.log.LoggerUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.httpclient.HttpClient;
@@ -12,6 +14,7 @@
 import org.slf4j.LoggerFactory;
 import org.yeshi.utils.HttpUtil;
 
+import java.lang.reflect.Field;
 import java.net.URLEncoder;
 import java.util.*;
 
@@ -143,11 +146,37 @@
     }
 
     public static PPTVSeries getDetail(String seriesCodes) {
+        Gson gson = new Gson();
         Map<String, String> params = new HashMap<>();
         params.put("seriesCodes", seriesCodes);
         String result = baseRequest(params, "pptv.channel.content.detail");
-        System.out.println(result);
-        return null;
+        JSONObject resultJSON = JSONObject.fromObject(result);
+        JSONArray array = resultJSON.optJSONObject("response").optJSONObject("body").optJSONArray("contentInfos");
+        List<PPTVProgram> programList = new ArrayList<>();
+        PPTVSeries pptvSeries = null;
+        for (int i = 0; i < array.size(); i++) {
+            JSONObject item = array.optJSONObject(i);
+            if (pptvSeries == null)
+                pptvSeries = gson.fromJson(item.toString(), PPTVSeries.class);
+
+            List<String> keys = new ArrayList<>();
+            for (Iterator<String> its = item.keys(); its.hasNext(); ) {
+                String key = its.next();
+                if (!key.contains("series_")) {
+                    keys.add(key);
+                }
+            }
+
+            for (String key : keys) {
+                item.remove(key);
+            }
+
+            String itemStr = item.toString().replace("series_", "");
+            PPTVProgram program = gson.fromJson(itemStr, PPTVProgram.class);
+            programList.add(program);
+        }
+        pptvSeries.setSeries(programList);
+        return pptvSeries;
     }
 
 
@@ -160,6 +189,7 @@
     public static String getOpenId(String uid) {
         Map<String, String> params = new HashMap<>();
         params.put("uid", uid);
+//        String result = baseRequest("https://coapi.pptv.com/coapi-web/api/http/sopRequest", params, "pptv.channel.openid.get");
         String result = baseRequest("https://coapi.pptv.com/coapi-web/api/http/sopRequest", params, "pptv.channel.openid.get");
         System.out.println(result);
         JSONObject resultJSON = JSONObject.fromObject(result);
@@ -183,7 +213,7 @@
      * @param code
      */
     public static boolean login(String code) {
-        String url = String.format("https://coapi.pptv.com/coapi-web/api/getUserToken/%s/%s.htm", APP_KEY, code);
+        String url = String.format("https://coapi.pptv.com/coapi-web/api/getUserToken/%s/%s.htm", APP_KEY, URLEncoder.encode(code));
         String result = HttpUtil.get(url);
         System.out.println(result);
         JSONObject resultJSON = JSONObject.fromObject(result);
@@ -203,13 +233,14 @@
     public static boolean buyGoods(String openId, String orderNo, String goodsNo, Date orderTime) {
         Map<String, String> params = new HashMap<>();
         params.put("openId", openId);
-        params.put("canal", CANAL);
+        params.put("canal", CHANNEL_ID);
         params.put("channel", "yeshi");
         params.put("goodsNo", goodsNo);
         params.put("outOrderId", orderNo);
         params.put("orderTime", TimeUtil.getGernalTime(orderTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
         params.put("sign", StringUtil.Md5(String.format("%s&%s&%s&%s", openId, params.get("channel"), orderNo, "2MnD8nCWu7EzbiJ")));
-        String result = get("http://uc.test.pptv.com/cusp/jointMember", params);
+        String result = get("http://billing.api.pptv.com/cusp/jointMember", params);
+        LoggerUtil.getVIPLogger().info("寮�閫氫細鍛�-璁㈠崟鍙凤細{},缁撴灉锛歿}", orderNo, result);
         System.out.println(result);
         JSONObject data = JSONObject.fromObject(result);
         if (data.optInt("errorCode") == 0) {
@@ -230,7 +261,8 @@
     }
 
     public static void main(String[] args) {
-        buyGoods("257dfd950c20ad25dee9f99ef926c0f8", "buwan_27", "DA7559531560894", new Date());
+        //DA7559531560894
+        buyGoods("257dfd950c20ad25dee9f99ef926c0f8", "buwan_100", "DA7559531560894", new Date());
     }
 
 

--
Gitblit v1.8.0