From 31e20ddb1eafa5bf64a0824629fb8c7a05450318 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 六月 2020 20:26:28 +0800
Subject: [PATCH] 商品系统完善

---
 src/main/java/com/ks/tool/bkz/controller/ParseController.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ks/tool/bkz/controller/ParseController.java b/src/main/java/com/ks/tool/bkz/controller/ParseController.java
index 5713c29..0535661 100644
--- a/src/main/java/com/ks/tool/bkz/controller/ParseController.java
+++ b/src/main/java/com/ks/tool/bkz/controller/ParseController.java
@@ -3,31 +3,35 @@
 import com.alibaba.fastjson.JSONObject;
 import com.ks.tool.bkz.dto.FirstOrderSubParseResult;
 import com.ks.tool.bkz.entity.FirstOrderSubInfo;
+import com.ks.tool.bkz.entity.user.UserInfo;
 import com.ks.tool.bkz.exception.TBCookieException;
-import com.ks.tool.bkz.service.FirstOrderSubInfoService;
 import com.ks.tool.bkz.service.manager.RedisManager;
+import com.ks.tool.bkz.service.sdlj.SDLJGoodsService;
+import com.ks.tool.bkz.service.user.UserService;
 import com.ks.tool.bkz.util.*;
-import org.omg.CORBA.PUBLIC_MEMBER;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.util.List;
 import java.util.Map;
 
 @Controller
-@RequestMapping("parse")
+@RequestMapping("sdlj/parse")
 public class ParseController {
     @Resource
     private RedisManager redisManager;
 
     @Resource
-    private FirstOrderSubInfoService firstOrderSubInfoService;
+    private SDLJGoodsService sdljGoodsService;
+
+    @Resource
+    private UserService userService;
 
     private String getCookieKey(String tbUid) {
         return "tbcookie-" + tbUid;
@@ -85,7 +89,7 @@
         if (!StringUtil.isNullOrEmpty(tbUid)) {
             redisManager.save(getCookieKey(tbUid), cookies, 60 * 60);
         }
-        return "";
+        return JsonUtil.loadTrueResult("");
     }
 
     @RequestMapping("getLoginUrl")
@@ -104,17 +108,20 @@
 
     @RequestMapping("uploadContent")
     @ResponseBody
-    public String uploadContent(String content) {
+    public String uploadContent(String content, String tbUid, HttpServletRequest request) {
+        String token = request.getHeader("token");
+        String account = UserUtil.getAccountFromToken(token);
+        UserInfo user = userService.selectByAccount(account);
         try {
             FirstOrderSubParseResult result = FirstOrderSubDataUtil.parseOrderSubData(content);
             if (result != null && result.isHasNextPage()) {
                 if (result.getGoodsList() != null)
                     for (FirstOrderSubInfo info : result.getGoodsList()) {
-                        firstOrderSubInfoService.add(info);
+                        sdljGoodsService.addSDLJGoods(info,user.getId(),tbUid );
                         System.out.println(info.getId() + "-" + info.getTitle());
                     }
                 System.out.println("----------------------------");
-                return JsonUtil.loadTrueResult(null);
+                return JsonUtil.loadTrueResult("");
             } else {
                 return JsonUtil.loadFalseResult(1, "鏃犳洿澶氭暟鎹�");
             }

--
Gitblit v1.8.0