三方服务-调整大淘客功能

thirdPartyWares_service/pom.xml

@@ -52,6 +52,12 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.5</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <build>

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/controller/TaobaoCallback.java

@@ -1,16 +1,22 @@
 package com.bjtdba.thirdPartWares.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.bjtdba.entity.thirdPartyWares.UserThird;
 import com.bjtdba.thirdPartWares.dao.UserThirdDao;
 import com.bjtdba.thirdPartWares.service.TaobaoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
 @Slf4j
 @RestController
 @RequestMapping("taobaoService")
@@ -20,21 +26,53 @@ public class TaobaoCallback {
     private TaobaoService taobaoService;
     @Autowired
     private UserThirdDao userThirdDao;
+    @Value("${TB.AUTH_REDIRECT_URI}")
+    private String authRedirectUri;
 
     /**
      * 淘宝回调
      */
 
     @GetMapping("/loginToken")
-    public ModelAndView getTaobaoAuthorizedLoginToken(String code,String state) throws IOException {
-        taobaoService.getTaobaoAuthorizedLoginToken(code,state);
-        return new ModelAndView("redirect:https://app.bjtdba.com/taobao_service/baichuan.html");
+    public ModelAndView getTaobaoAuthorizedLoginToken(String code, String state) throws IOException {
+        String decodedState = "";
+        if (state != null) {
+            decodedState = URLDecoder.decode(state, "UTF-8");
+            // Base64 解码
+            byte[] decodedBytes = Base64.getDecoder().decode(decodedState);
+            decodedState = new String(decodedBytes, StandardCharsets.UTF_8);
+        }
+        taobaoService.getTaobaoAuthorizedLoginToken(code, decodedState);
+        String viewName = "redirect:" + authRedirectUri;
+
+        if (!decodedState.isEmpty()) {
+            JSONObject stateObject = JSONObject.parseObject(decodedState);
+
+            // 构建最终 URL
+            StringBuilder finalUrlBuilder = new StringBuilder(viewName);
+            boolean firstParam = true;
+
+            for (String key : stateObject.keySet()) {
+                String value = stateObject.getString(key);
+                if (firstParam) {
+                    finalUrlBuilder.append("?");
+                    firstParam = false;
+                } else {
+                    finalUrlBuilder.append("&");
+                }
+                finalUrlBuilder.append(key).append("=").append(value);
+            }
+            viewName = finalUrlBuilder.toString();
+            System.out.println(stateObject.toJSONString());
+            System.out.println(viewName);
+        }
+        return new ModelAndView(viewName);
     }
 
     @GetMapping("/thridUser")
-    public  void thridUser(String time,String Pid,String Pidname,String Type,String Uid){
+    public void thridUser(String time, String Pid, String Pidname, String Type, String Uid) {
         log.info("===========+? Create_time,? Pid,? Pid_name,? Type,String Uid", time, Pid, Pidname, Type, Uid);
-        UserThird userThird=new UserThird();
+        UserThird userThird = new UserThird();
         userThird.setCreate_time(time);
         userThird.setPid(Pid);
         userThird.setPid_name(Pidname);

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/controller/TaobaoController.java

@@ -43,7 +43,7 @@ public class TaobaoController {
      */
     @PostMapping("/dtkchangeLink")
     public Object dtkchangeLink(@RequestBody Map<String,String> map){
-        return taobaoService.dtkchangeLink(map.get("id"),map.get("uid"));
+        return taobaoService.dtkchangeLink(map.get("id"),map.get("uid"),map.get("source"));
     }
 
 

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/service/TaobaoService.java

@@ -14,7 +14,7 @@ public interface TaobaoService {
 
     Object selectWaresDetail(String id, String goodsId, String uid) throws IOException;
 
-    Object dtkchangeLink(String id, String uid);
+    Object dtkchangeLink(String id, String uid, String source);
 
     Object saveThirdPartGood();
 

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/service/impl/TaobaoServiceImpl.java

@@ -18,8 +18,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -197,7 +200,7 @@ public class TaobaoServiceImpl implements TaobaoService {
      public Object saveThirdPartGood(){
         //定时执行180次3.6万条数据存入数据库
         int aa=1;
-        for(int i=1;i<=1800;i++){
+        for(int i=1;i<=180;i++){
             log.info("=================================开始循环第"+i+"次=========================");
             List<ThirdPartyWares> thirdPartyWaresList =selectTaobaoWaresList(i+"",200+"",null);
             //用来接收json的值
@@ -349,7 +352,7 @@ public class TaobaoServiceImpl implements TaobaoService {
      * @throws
      * @throws IOException
      */
-    public Object dtkchangeLink(String id, String uid) {
+    public Object dtkchangeLink(String id, String uid, String source) {
         Map<String,Object> data=new HashMap<String,Object>();
         /**
          * 判断该用户是否已经授权淘宝  rrx_user_third
@@ -376,19 +379,48 @@ public class TaobaoServiceImpl implements TaobaoService {
                 return ResponseUtil.fail("该商品已下架或不存在~");
             }
             JSONObject jsonObjects = JSONObject.parseObject(JSONObject.parseObject(sendGet).get("data").toString());
-            Raw raw = new Raw();
-            raw.setCouponEndTime((String) jsonObjects.get("couponEndTime"));
-            raw.setCouponInfo((String) jsonObjects.get("couponInfo"));
-            raw.setCouponStartTime((String) jsonObjects.get("couponStartTime"));
-            raw.setLongTpwd((String) jsonObjects.get("longTpwd"));
-            raw.setTpwd((String) jsonObjects.get("tpwd"));
+//            Raw raw = new Raw();
+//            raw.setCouponEndTime((String) jsonObjects.get("couponEndTime"));
+//            raw.setCouponInfo((String) jsonObjects.get("couponInfo"));
+//            raw.setCouponStartTime((String) jsonObjects.get("couponStartTime"));
+//            raw.setLongTpwd((String) jsonObjects.get("longTpwd"));
+//            raw.setTpwd((String) jsonObjects.get("tpwd"));
+            data.put("data", jsonObjects);
             data.put("link", jsonObjects.get("shortUrl"));
             data.put("code",1);
         }else{
             //走淘宝获取pid接口  https://oauth.taobao.com/authorize?response_type=code&client_id=CLIENTID&redirect_uri=REDIRECTURI&state=STATE&view=web
-            String link = tbHost.replace("CLIENTID",tbAppKey).replace("REDIRECTURI",redirecturi).replace("STATE",uid);
-            data.put("link",link);
-            data.put("code",0);
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("uid", uid);
+            jsonObject.put("itemId", id);
+            jsonObject.put("source", source);
+            try {
+                String base64State = Base64.getEncoder().encodeToString(jsonObject.toString().getBytes(StandardCharsets.UTF_8));
+                String encodedState = URLEncoder.encode(base64State, "UTF-8");
+                String encodedRedirectUri = URLEncoder.encode(redirecturi, "UTF-8");
+                System.out.println(encodedState);
+                String link = tbHost.replace("CLIENTID", tbAppKey)
+                        .replace("REDIRECTURI", encodedRedirectUri)
+                        .replace("STATE", encodedState);
+
+                System.out.println("生成的链接: " + link);
+
+                data.put("link",link);
+                data.put("code",0);
+            } catch (UnsupportedEncodingException e) {
+                // 处理编码异常
+                e.printStackTrace();
+                return null;
+            }
+
+//            JSONObject jsonObject = new JSONObject();
+//            jsonObject.put("uid", uid);
+//            jsonObject.put("itemId", id);
+//            jsonObject.put("source", source);
+//            String link = tbHost.replace("CLIENTID",tbAppKey).replace("REDIRECTURI",redirecturi).replace("STATE",jsonObject.toString());
+
+
         }
         return ResponseUtil.ok(data);
     }
@@ -406,14 +438,22 @@ public class TaobaoServiceImpl implements TaobaoService {
         params.put("sign_method", "hmac");
         params.put("code", code);
         params.put("sign", SignTop.signTopRequest(params, tbkAppSecret, "hmac"));
+        System.out.println("***************taobao.top.auth.token.create start *****************");
+        System.out.println(params.toString());
         String a = SignTop.callApi(new URL("https://eco.taobao.com/router/rest"), params);
+        System.out.println("原始响应字符串: " + a);
         JSONObject jsonObjects = JSONObject.parseObject(a);
+        System.out.println("解析为JSONObject后: " + jsonObjects.toJSONString());
+        System.out.println("***************taobao.top.auth.token.create* end****************");
         Object token = JSONObject.parseObject(JSONObject.parseObject(jsonObjects.get("top_auth_token_create_response").toString()).get("token_result").toString()).get("access_token");
         //备案
         demo(token.toString(),state);
     }
     //备案
     private void demo(String token,String state) throws IOException {
+
+        JSONObject stateObject = JSONObject.parseObject(state);
+
         Map<String, String> params = new HashMap<String, String>();
         // 公共参数
         params.put("method", "taobao.tbk.sc.publisher.info.save");
@@ -425,20 +465,29 @@ public class TaobaoServiceImpl implements TaobaoService {
         params.put("v", "2.0");
         params.put("sign_method","hmac");
         // 业务参数
-        params.put("inviter_code","E7LRL8");
+        // 会员
+        // params.put("inviter_code","RQHQ8Z");
+        // 渠道
+        params.put("inviter_code","BCS4V5");
         params.put("info_type","1");
-        params.put("note","储_"+state);
+        params.put("note","幸福_"+stateObject.get("uid"));
         // 签名参数
         params.put("sign", SignTop.signTopRequest(params, tbkAppSecret, "hmac"));
         // 请用API
+        System.out.println("***************taobao.tbk.sc.publisher.info.save start *****************");
         System.out.println(params.toString());
         String callApi = SignTop.callApi(new URL("https://eco.taobao.com/router/rest"), params);
+        // 打印原始字符串
+        System.out.println("原始响应字符串: " + callApi);
         JSONObject jsonObjects = JSONObject.parseObject(callApi);
+        // 打印解析后的JSONObject（使用toString，但通常toString没有格式化，我们可以用toJSONString来美化）
+        System.out.println("解析为JSONObject后: " + jsonObjects.toJSONString());
+        System.out.println("***************taobao.tbk.sc.publisher.info.save end *****************");
         String data = JSONObject.parseObject(jsonObjects.get("tbk_sc_publisher_info_save_response").toString()).get("data").toString();
         Object account_name = JSONObject.parseObject(data).get("account_name");
         Object relation_id = JSONObject.parseObject(data).get("relation_id");
         UserThird userThird = new UserThird();
-        userThird.setUid(state);
+        userThird.setUid((String) stateObject.get("uid"));
         userThird.setPid(relation_id.toString());
         userThird.setPid_name(account_name.toString());
         userThird.setCreate_time(new Date().getTime()+"");

thirdPartyWares_service/src/main/resources/application-dev.yml

@@ -37,4 +37,6 @@ eureka:
     prefer-ip-address: true #使用ip地址注册
 
 
-TB.REDIRECTURI: https://app.bjtdba.com/taobao_service/taobaoService/loginToken
+TB.REDIRECTURI: https://testapi.hxxfb.com/taobao_service/taobaoService/loginToken
+
+TB.AUTH_REDIRECT_URI: https://testapi.hxxfb.com/taobao_service/baichuan.html

thirdPartyWares_service/src/main/resources/application-pro.yml

@@ -37,4 +37,6 @@ eureka:
     prefer-ip-address: true #使用ip地址注册
 
 
-TB.REDIRECTURI: https://app.bjtdba.com/taobao_service/taobaoService/loginToken
+TB.REDIRECTURI: https://api.hxxfb.com/taobao_service/taobaoService/loginToken
+
+TB.AUTH_REDIRECT_URI: https://api.hxxfb.com/taobao_service/baichuan.html

thirdPartyWares_service/src/main/resources/application.yml

@@ -26,17 +26,17 @@ pagehelper:
 #DTK.HOST: https://openapi.dataoke.com
 
 
-DTK.APPSECRET: 0e4f0cdf9b1a58d763bcb956b56578da
-DTK.APPKEY: 6002a6fd58162
-DTK.PID: mm_1411990095_2149000369_111007900247
+DTK.APPSECRET: 6b701ad73c7cc4c2de56a4afcb876af2
+DTK.APPKEY: 691e84c785246
+DTK.PID: mm_9436146813_3362200454_116174700455
 DTK.HOST: https://openapi.dataoke.com
 
 
 #淘宝
-TB.APPKEY: 31940963
-TB.APPSECRET: f8437ad5821d697bae35f3fa613b6370
-TB.ADZONEID: 111007900247
-TB.HOST: https://oauth.taobao.com/authorize?response_type=code&client_id=CLIENTID&redirect_uri=REDIRECTURI&state=STATE&view=web
+TB.APPKEY: 35214206
+TB.APPSECRET: b4ec4e885fb4a189d3beb475fbb15dc6
+TB.ADZONEID: 116174700455
+TB.HOST: https://oauth.taobao.com/authorize?response_type=code&client_id=CLIENTID&redirect_uri=REDIRECTURI&state=STATE&view=wap
 
 
 

thirdPartyWares_service/src/main/resources/static/baichuan.html

@@ -1,19 +1,334 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
+
 <head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
-<title></title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <title>授权成功</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+            background: linear-gradient(135deg, #ff5000 0%, #ff7a45 100%);
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 20px;
+        }
+
+        .container {
+            background: white;
+            border-radius: 20px;
+            box-shadow: 0 20px 40px rgba(255, 80, 0, 0.2);
+            padding: 40px 30px;
+            text-align: center;
+            max-width: 90%;
+            width: 350px;
+            animation: fadeIn 0.5s ease-out;
+        }
+
+        @keyframes fadeIn {
+            from {
+                opacity: 0;
+                transform: translateY(20px);
+            }
+
+            to {
+                opacity: 1;
+                transform: translateY(0);
+            }
+        }
+
+        .success-icon {
+            width: 80px;
+            height: 80px;
+            background: linear-gradient(135deg, #ff5000 0%, #ff7a45 100%);
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin: 0 auto 20px;
+        }
+
+        .success-icon::after {
+            content: "✓";
+            color: white;
+            font-size: 40px;
+            font-weight: bold;
+        }
+
+        h1 {
+            color: #333;
+            font-size: 24px;
+            margin-bottom: 10px;
+        }
+
+        p {
+            color: #666;
+            font-size: 16px;
+            line-height: 1.5;
+            margin-bottom: 25px;
+        }
+
+        .taokouling-box {
+            background: #fff9f5;
+            border: 1px solid #ffebe1;
+            border-radius: 12px;
+            padding: 15px;
+            margin: 25px 0;
+            position: relative;
+        }
+
+        .taokouling-text {
+            font-size: 18px;
+            font-weight: bold;
+            color: #ff5000;
+            word-break: break-all;
+            user-select: all;
+        }
+
+        .copy-btn {
+            background: linear-gradient(135deg, #ff5000 0%, #ff7a45 100%);
+            color: white;
+            border: none;
+            border-radius: 50px;
+            padding: 15px 25px;
+            font-size: 16px;
+            font-weight: bold;
+            cursor: pointer;
+            width: 100%;
+            transition: all 0.3s ease;
+            margin-top: 10px;
+            box-shadow: 0 4px 15px rgba(255, 80, 0, 0.3);
+        }
+
+        .copy-btn:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 10px 20px rgba(255, 80, 0, 0.4);
+        }
+
+        .copy-btn:active {
+            transform: translateY(0);
+        }
+
+        .loading {
+            display: none;
+            margin: 20px auto;
+        }
+
+        .spinner {
+            border: 3px solid #ffebe1;
+            border-top: 3px solid #ff5000;
+            border-radius: 50%;
+            width: 30px;
+            height: 30px;
+            animation: spin 1s linear infinite;
+            margin: 0 auto;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+
+        .message {
+            margin-top: 15px;
+            padding: 10px;
+            border-radius: 8px;
+            font-size: 14px;
+            display: none;
+        }
+
+        .success-message {
+            background-color: #fff5e6;
+            color: #cc4100;
+            border: 1px solid #ffd0b3;
+        }
+
+        .error-message {
+            background-color: #ffece6;
+            color: #cc3200;
+            border: 1px solid #ffb3a0;
+        }
+
+        .redirect-info {
+            font-size: 14px;
+            color: #ff9c66;
+            margin-top: 20px;
+        }
+    </style>
 </head>
+
 <body>
-<div>
-    授权成功,请稍等...
+<div class="container">
+    <div class="success-icon"></div>
+    <h1>授权成功</h1>
+    <p>恭喜您已成功授权，即将为您跳转至淘宝APP</p>
+
+    <div class="loading" id="loading">
+        <div class="spinner"></div>
+        <p>正在获取淘口令...</p>
+    </div>
+
+    <div class="taokouling-box" id="taokoulingBox" style="display: none;">
+        <div class="taokouling-text" id="taokoulingText"></div>
+    </div>
+
+    <button class="copy-btn" id="copyBtn" style="display: none;" onclick="copyTaokouling()">
+        复制淘口令并打开淘宝
+    </button>
+
+    <div class="message" id="message"></div>
+
+    <div class="redirect-info">
+        如果未自动跳转，请手动打开淘宝APP
+    </div>
 </div>
+
 <script type="text/javascript" src="https://g.alicdn.com/mtb/lib_BC/0.1.0/p/index/index.js"></script>
 <script type="text/javascript">
+    // 页面加载完成后执行
     window.onload = function () {
-        android.back();
+        // 显示加载状态
+        document.getElementById('loading').style.display = 'block';
+
+        // 获取URL参数
+        const urlParams = new URLSearchParams(window.location.search);
+        const id = urlParams.get('uid');
+        const itemid = urlParams.get('itemId');
+        const source = urlParams.get('source');
+
+        // 发起HTTP请求获取淘口令
+        fetchTaokouling(id, itemid, source);
+    };
+
+    // 从服务器获取淘口令
+    function fetchTaokouling(id, itemid, source) {
+        // 构造请求URL
+        const apiUrl = `https://testapi.hxxfb.com/gateway/thirdPartyWares_service/taobao_service/dtkchangeLink`;
+
+        // 构造请求参数
+        const requestData = {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                uid: id,
+                id: itemid
+            })
+        };
+
+        // 发起请求
+        fetch(apiUrl, requestData)
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('网络响应错误');
+                }
+                return response.json();
+            })
+            .then(data => {
+                // 检查source是否为xiaochengxu
+                if (source == "xiaochengxu") {
+                    // 如果是小程序来源，直接跳转到shortUrl
+                    if (data.data && data.data.data && data.data.data.shortUrl) {
+                        window.location.href = data.data.data.shortUrl;
+                    } else {
+                        throw new Error('未获取到短链接');
+                    }
+                } else {
+                    // 检查是否有淘口令
+                    if (data.data && data.data.data && data.data.data.longTpwd) {
+                        // 隐藏加载状态
+                        document.getElementById('loading').style.display = 'none';
+
+                        // 显示淘口令和按钮
+                        document.getElementById('taokoulingText').textContent = data.data.data.longTpwd;
+                        document.getElementById('taokoulingBox').style.display = 'block';
+                        document.getElementById('copyBtn').style.display = 'block';
+
+                        // 保存淘口令到全局变量
+                        window.taokouling = data.data.data.longTpwd;
+                    } else {
+                        throw new Error('未获取到淘口令');
+                    }
+                }
+            })
+            .catch(error => {
+                console.error('请求失败:', error);
+                showMessage('获取信息失败，请稍后重试', 'error');
+                document.getElementById('loading').style.display = 'none';
+            });
+    }
+
+    // 复制淘口令并跳转到淘宝
+    function copyTaokouling() {
+        try {
+            // 创建临时文本区域用于复制
+            const textArea = document.createElement("textarea");
+            textArea.value = window.taokouling;
+            document.body.appendChild(textArea);
+            textArea.select();
+            document.execCommand('copy');
+            document.body.removeChild(textArea);
+
+            // 显示成功消息
+            showMessage('淘口令已复制到剪贴板，请在淘宝APP中使用', 'success');
+
+            // 延迟跳转到淘宝APP
+            setTimeout(() => {
+                // 尝试跳转到淘宝APP
+                if (isMobile()) {
+                    // 移动端尝试跳转到淘宝APP
+                    window.location.href = "taobao://";
+                } else {
+                    // PC端提示用户打开淘宝
+                    alert("请打开淘宝APP使用淘口令");
+                }
+
+                // 返回原应用（如果支持）
+                try {
+                    android.back();
+                } catch (e) {
+                    console.log("无法调用原生返回方法");
+                }
+            }, 1500);
+
+        } catch (err) {
+            showMessage('复制失败，请手动复制淘口令', 'error');
+            console.error('复制失败:', err);
+        }
+    }
+
+    // 显示消息
+    function showMessage(text, type) {
+        const messageEl = document.getElementById('message');
+        messageEl.textContent = text;
+        messageEl.className = 'message ' + (type === 'success' ? 'success-message' : 'error-message');
+        messageEl.style.display = 'block';
+
+        // 3秒后隐藏消息
+        setTimeout(() => {
+            messageEl.style.display = 'none';
+        }, 3000);
+    }
+
+    // 判断是否为移动设备
+    function isMobile() {
+        return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
     }
 </script>
 </body>
-</html>
+
+</html>