update

pdd-api/src/main/java/com/qihang/pdd/controller/AjaxOrderPddController.java

@@ -63,9 +63,9 @@ public class AjaxOrderPddController {
         if(!StringUtils.hasText(platform.getAppSecret())) {
             return ApiResult.build(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到AppSercet");
         }
-//        if(!StringUtils.hasText(platform.getRedirectUri())) {
+        if(!StringUtils.hasText(platform.getRedirectUri())) {
-//            return ApiResult.build(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到RedirectUri");
+            return ApiResult.build(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到RedirectUri");
-//        }
+        }
 //        if(!StringUtils.hasText(platform.getServerUrl())) {
 //            return ApiResult.build(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到ServerUrl");
 //        }

pdd-api/src/main/java/com/qihang/pdd/controller/PddOAuthController.java

@@ -1,83 +1,92 @@
-//package com.qihang.pdd.controller;
+package com.qihang.pdd.controller;
-//
+
-//
+
-//import com.pdd.pop.sdk.http.PopAccessTokenClient;
+import com.pdd.pop.sdk.http.PopAccessTokenClient;
-//import com.pdd.pop.sdk.http.token.AccessTokenResponse;
+import com.pdd.pop.sdk.http.token.AccessTokenResponse;
-//import com.qihang.erp.api.service.IShopService;
+import com.qihang.common.enums.EnumShopType;
-//import com.zhijian.core.config.ServerConfig;
+import com.qihang.pdd.domain.SysPlatform;
-//import org.slf4j.Logger;
+import com.qihang.pdd.service.SysPlatformService;
-//import org.slf4j.LoggerFactory;
+import com.qihang.pdd.service.SysShopService;
-//import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletRequest;
-//import org.springframework.stereotype.Controller;
+import lombok.AllArgsConstructor;
-//import org.springframework.ui.Model;
+import org.slf4j.Logger;
-//import org.springframework.web.bind.annotation.RequestMapping;
+import org.slf4j.LoggerFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.beans.factory.annotation.Autowired;
-//
+import org.springframework.stereotype.Controller;
-//import javax.servlet.http.HttpServletRequest;
+import org.springframework.ui.Model;
-//import java.io.IOException;
+import org.springframework.web.bind.annotation.RequestMapping;
-//
+import org.springframework.web.bind.annotation.RequestParam;
-//@RequestMapping("/pdd_api2")
+import java.io.IOException;
-//@Controller
+import java.net.URLEncoder;
-//public class PddOAuthController {
+
+@AllArgsConstructor
+@RequestMapping("/pdd_api2")
+@Controller
+public class PddOAuthController {
+    private final SysShopService shopService;
+    private final SysPlatformService platformService;
 //    @Autowired
 //    private IShopService shopService;
 //    @Autowired
 //    private ServerConfig serverConfig;
-//    private static Logger log = LoggerFactory.getLogger(PddOAuthController.class);
+    private static Logger log = LoggerFactory.getLogger(PddOAuthController.class);
-//
+
-//    @RequestMapping("/oauth")
+    @RequestMapping("/oauth")
-//    public String oauth(HttpServletRequest req) {
+    public String oauth(OpenApiRequest reqData) {
 //        String returnUrl = serverConfig.getUrl() + "/pdd_api/getToken&state="+req.getParameter("shopId");
-//        var shop = shopService.selectShopById(Long.parseLong(req.getParameter("shopId")));
+        var shop = shopService.selectShopById(reqData.getShopId());
-//
+        SysPlatform platform = platformService.selectById(EnumShopType.PDD.getIndex());
-//        String appKey = shop.getAppkey();
+        String appKey = platform.getAppKey();
-//        String appSercet = shop.getAppSercet();
+        String appSercet = platform.getAppSecret();
-//
+
-//        String url = "https://mms.pinduoduo.com/open.html?response_type=code&client_id=" + appKey + "&redirect_uri=" + returnUrl;
+        String url = "https://mms.pinduoduo.com/open.html?response_type=code&client_id=" + appKey + "&redirect_uri=" + URLEncoder.encode(platform.getRedirectUri());
-//        return "redirect:" + url;
+        return url;
-//    }
+    }
-//
+
-//    @RequestMapping("/getToken")
+    @RequestMapping("/getToken")
-//    public String getToken(HttpServletRequest req) throws IOException, InterruptedException {
+    public String getToken(HttpServletRequest req) throws IOException, InterruptedException {
-//        log.info("/**********获取拼多多授权token*********/");
+        log.info("/**********获取拼多多授权token*********/");
-//        String code = req.getParameter("code");
+        String code = req.getParameter("code");
-//
+
-//        Long shopId =Long.parseLong(req.getParameter("state"));
+        Integer shopId =Integer.parseInt(req.getParameter("state"));
-//        var shop = shopService.selectShopById(shopId);
+        var shop = shopService.selectShopById(shopId);
-//        String appKey = shop.getAppkey();
+        SysPlatform platform = platformService.selectById(EnumShopType.PDD.getIndex());
-//        String appSercet = shop.getAppSercet();
+        String appKey = platform.getAppKey();
-//        PopAccessTokenClient accessTokenClient = new PopAccessTokenClient(appKey, appSercet);
+        String appSercet = platform.getAppSecret();
-//
+
-//        // 生成AccessToken
+        PopAccessTokenClient accessTokenClient = new PopAccessTokenClient(appKey, appSercet);
-//        try {
+
-//            AccessTokenResponse response = accessTokenClient.generate(code);
+        // 生成AccessToken
-//            if(response.getErrorResponse()!=null){
+        try {
-//                log.info("/***************获取拼多多授权token错误："+response.getErrorResponse().getErrorMsg()+"**************/");
+            AccessTokenResponse response = accessTokenClient.generate(code);
-//            }else{
+            if(response.getErrorResponse()!=null){
-//                //保存accessToken
+                log.info("/***************获取拼多多授权token错误："+response.getErrorResponse().getErrorMsg()+"**************/");
-//                System.out.println(shopId +"--token:" + response.getAccessToken()+",thirdId:"+response.getOwnerId()+",shopId:"+shopId);
+            }else{
-//
+                //保存accessToken
+                System.out.println(shopId +"--token:" + response.getAccessToken()+",thirdId:"+response.getOwnerId()+",shopId:"+shopId);
+
 //                shopService.updateSessionKey(shopId,Long.parseLong(response.getOwnerId()),response.getAccessToken());
-//
+                shopService.updateSessionKey(shopId,response.getAccessToken(),response.getRefreshToken());
-////                thirdSettingService.updateEntity(shopId, response.getAccessToken(), response.getRefreshToken(), response.getExpiresIn(),response.getOwnerId());
+
-//                return "redirect:/pdd/getTokenSuccess?mallId="+response.getOwnerId();
+//                thirdSettingService.updateEntity(shopId, response.getAccessToken(), response.getRefreshToken(), response.getExpiresIn(),response.getOwnerId());
-///*                String state = req.getParameter("state");
+                return "redirect:/pdd/getTokenSuccess?mallId="+response.getOwnerId();
-//                if (state.equalsIgnoreCase("GETORDERLIST")) {
+/*                String state = req.getParameter("state");
-//                    //获取订单list
+                if (state.equalsIgnoreCase("GETORDERLIST")) {
-//                    return "redirect:/shop/shop_list";
+                    //获取订单list
-//                } else if (state.equalsIgnoreCase("DCGOODSLIST")) {
+                    return "redirect:/shop/shop_list";
-//                    //商品list
+                } else if (state.equalsIgnoreCase("DCGOODSLIST")) {
-//                    return "redirect:/goods/pdd_list";
+                    //商品list
-//                }*/
+                    return "redirect:/goods/pdd_list";
-//            }
+                }*/
-//        } catch (Exception e) {
+            }
-//
+        } catch (Exception e) {
-//            e.printStackTrace();
+
-//
+            e.printStackTrace();
-//        }
+
-//        return "redirect:/";
+        }
-//    }
+        return "redirect:/";
-//
+    }
+
 //    /**
 //     * 获取授权成功
 //     * @param req
@@ -91,7 +100,7 @@
 //        model.addAttribute("shopId",shop.getId());
 //        return "get_token_success";
 //    }
-//
+
-//
+
-//
+
-//}
+}

pdd-api/src/main/java/com/qihang/pdd/service/SysShopService.java

@@ -11,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface SysShopService extends IService<SysShop> {
     SysShop selectShopById(Integer shopId);
 
-    void updateSessionKey(Integer shopId,String sessionKey);
+    void updateSessionKey(Integer shopId,String sessionKey,String refreshToken);
 }

pdd-api/src/main/java/com/qihang/pdd/service/impl/SysShopServiceImpl.java

@@ -24,10 +24,11 @@ public class SysShopServiceImpl extends ServiceImpl<SysShopMapper, SysShop>
     }
 
     @Override
-    public void updateSessionKey(Integer shopId, String sessionKey) {
+    public void updateSessionKey(Integer shopId, String sessionKey,String refreshToken) {
         SysShop shop = new SysShop();
         shop.setId(shopId);
         shop.setAccessToken(sessionKey);
+        shop.setRefreshToken(refreshToken);
         mapper.updateById(shop);
     }
 }