yumeng 1 rok pred
rodič
commit
c477ca793a

+ 3 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java

@@ -316,7 +316,7 @@ public class KuaishouItemListController extends BaseController {
 
 
     @GetMapping("/addCategoryId")
     @GetMapping("/addCategoryId")
     public void addCategoryId() throws KsMerchantApiException {
     public void addCategoryId() throws KsMerchantApiException {
-        kuaishouItemListService.addCategoryId();
+     //   kuaishouItemListService.addCategoryId();
     }
     }
 
 
     @GetMapping("/getCategoryIds")
     @GetMapping("/getCategoryIds")
@@ -486,7 +486,7 @@ public class KuaishouItemListController extends BaseController {
             if (Check.isNull(activityId)) {
             if (Check.isNull(activityId)) {
                 throw new Exception("请传入活动ID");
                 throw new Exception("请传入活动ID");
             }
             }
-            return kuaishouItemListService.getInvalidItemList(activityId, itemId);
+            return kuaishouItemListService.getInvalidItemList(activityId, itemId, null);
 
 
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
@@ -512,7 +512,7 @@ public class KuaishouItemListController extends BaseController {
             if (Check.isNull(activityId)) {
             if (Check.isNull(activityId)) {
                 throw new Exception("请传入活动ID");
                 throw new Exception("请传入活动ID");
             }
             }
-            return kuaishouItemListService.getInvestmentActivityOpenItemList(activityId, itemId);
+            return kuaishouItemListService.getInvestmentActivityOpenItemList(activityId, itemId, null);
 
 
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();

+ 3 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemListService.java

@@ -31,7 +31,7 @@ public interface IKuaishouItemListService {
 
 
     int deleteKuaishouItemListByItemIds(Long[] itemIds);
     int deleteKuaishouItemListByItemIds(Long[] itemIds);
 
 
-    int addCategoryId() throws KsMerchantApiException;
+    //  int addCategoryId() throws KsMerchantApiException;
 
 
     List<JSONObject> getCategoryIds();
     List<JSONObject> getCategoryIds();
 
 
@@ -53,8 +53,8 @@ public interface IKuaishouItemListService {
 
 
     JSONObject selectRuleItemByItemId(Long itemId);
     JSONObject selectRuleItemByItemId(Long itemId);
 
 
-    JSONObject getInvalidItemList(Long activityId, Long itemId);
+    JSONObject getInvalidItemList(Long activityId, Long itemId,KuaishouAccessToken accessToken);
 
 
-    JSONObject getInvestmentActivityOpenItemList(Long activityId, Long itemId);
+    JSONObject getInvestmentActivityOpenItemList(Long activityId, Long itemId,KuaishouAccessToken accessToken);
 }
 }
 
 

+ 26 - 25
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -49,9 +49,6 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     private SupplyChainMapper supplyChainMapper;
     private SupplyChainMapper supplyChainMapper;
 
 
     private static final String URL = "https://openapi.kwaixiaodian.com";
     private static final String URL = "https://openapi.kwaixiaodian.com";
-    private static final String APP_KEY = "ks665688320292774929";
-    private static final String SIGN_SECRET = "8e21f5bc03b6d2dc63e6256225dac00b";
-    private static final String ACCESS_TOKEN = "ChFvYXV0aC5hY2Nlc3NUb2tlbhJgRRYexR4CcaFdzFjRbypa-LLm_VI8yszm2oOObl-Jxpiz0qaeiyIL7U3fi3UQG_00okHGJ46anxC5x93wP08PEKWNgFNG6Zw02gtSIneXKSvJadYo4gLAbC1_l2pRImYhGhIeDW0O_HJFEKjDxSQA3OJTJ50iIJNQE8xVnSErjFE7xieNEHKjHuao4lXp95n5zhzP5-bKKAUwAQ";
 
 
 
 
     @Override
     @Override
@@ -85,7 +82,11 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     @Override
     @Override
     public JSONObject getItemDetail(Long regId, Long activityId, Long itemId, KuaishouAccessToken accessToken) throws Exception {
     public JSONObject getItemDetail(Long regId, Long activityId, Long itemId, KuaishouAccessToken accessToken) throws Exception {
         // 调用爬虫信息
         // 调用爬虫信息
-        //      JSONObject invaliItemDetail = getInvaliItemDetail(regId, activityId, itemId);
+        JSONObject itemList = this.getInvestmentActivityOpenItemList(activityId, itemId, accessToken);
+        JSONObject invalidJson = new JSONObject();
+        if (!Check.isNull(itemList)) {
+            invalidJson = itemList.getJSONObject("data");
+        }
         JSONObject returnJson = new JSONObject();
         JSONObject returnJson = new JSONObject();
         AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(KuaiShouConstants.KFX_URL, accessToken.getAppKey(), accessToken.getAppSecret());
         AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(KuaiShouConstants.KFX_URL, accessToken.getAppKey(), accessToken.getAppSecret());
         OpenDistributionInvestmentActivityItemDetailRequest request = new OpenDistributionInvestmentActivityItemDetailRequest();
         OpenDistributionInvestmentActivityItemDetailRequest request = new OpenDistributionInvestmentActivityItemDetailRequest();
@@ -119,10 +120,10 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
             itemJson.put("detailUrl", "https://app.kwaixiaodian.com/merchant/shop/detail?id=" + itemId);
             itemJson.put("detailUrl", "https://app.kwaixiaodian.com/merchant/shop/detail?id=" + itemId);
 
 
             //  有效商品列表
             //  有效商品列表
-            JSONObject effectiveItemJson = new JSONObject();
-            if (!Check.isNull(effectiveItemJson)) {
-                itemJson.put("regimentalPromotionRate", effectiveItemJson.getLong("investmentPromotionRate"));
-                itemJson.put("commissionRate", effectiveItemJson.getLong("itemCommissionRate"));
+
+            if (!Check.isNull(invalidJson)) {
+                itemJson.put("regimentalPromotionRate", invalidJson.getLong("investmentPromotionRate"));
+                itemJson.put("commissionRate", invalidJson.getLong("itemCommissionRate"));
             }
             }
 
 
             returnJson.put("judgeStatus", 1);
             returnJson.put("judgeStatus", 1);
@@ -130,8 +131,6 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
             returnJson.put("code", 0);
             returnJson.put("code", 0);
             returnJson.put("message", "查询成功");
             returnJson.put("message", "查询成功");
         } else if (code != 1) { // 商品下线
         } else if (code != 1) { // 商品下线
-            //    return invaliItemDetail;
-            JSONObject invalidJson = new JSONObject();
             JSONObject invalidItemJson = new JSONObject();
             JSONObject invalidItemJson = new JSONObject();
             invalidItemJson.put("itemId", invalidJson.getLong("itemId"));
             invalidItemJson.put("itemId", invalidJson.getLong("itemId"));
             invalidItemJson.put("itemTitle", invalidJson.getLong("itemTitle"));
             invalidItemJson.put("itemTitle", invalidJson.getLong("itemTitle"));
@@ -140,10 +139,12 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
             invalidItemJson.put("itemImgUrl", invalidJson.getLong("itemImgUrl"));
             invalidItemJson.put("itemImgUrl", invalidJson.getLong("itemImgUrl"));
             invalidItemJson.put("itemDescUrls", invalidJson.getLong("itemImgUrl"));
             invalidItemJson.put("itemDescUrls", invalidJson.getLong("itemImgUrl"));
             invalidItemJson.put("activityId", activityId);
             invalidItemJson.put("activityId", activityId);
-            invalidItemJson.put("activityItemS tatus", invalidJson.getLong("status"));
+            invalidItemJson.put("activityItemStatus", invalidJson.getLong("itemAuditStatus"));
             invalidItemJson.put("commissionRate", invalidJson.getLong("itemCommissionRate"));
             invalidItemJson.put("commissionRate", invalidJson.getLong("itemCommissionRate"));
             invalidItemJson.put("detailUrl", "https://app.kwaixiaodian.com/merchant/shop/detail?id=" + itemId);
             invalidItemJson.put("detailUrl", "https://app.kwaixiaodian.com/merchant/shop/detail?id=" + itemId);
             invalidItemJson.put("regimentalPromotionRate", invalidJson.getLong("investmentPromotionRate"));
             invalidItemJson.put("regimentalPromotionRate", invalidJson.getLong("investmentPromotionRate"));
+            invalidItemJson.put("categoryName", invalidJson.getString("categoryName"));
+            invalidItemJson.put("categoryId", invalidJson.getString("categoryId"));
             returnJson.put("judgeStatus", 2);
             returnJson.put("judgeStatus", 2);
             returnJson.put("itemJson", invalidItemJson);
             returnJson.put("itemJson", invalidItemJson);
             returnJson.put("code", 0);
             returnJson.put("code", 0);
@@ -342,12 +343,12 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         return kuaishouItemListMapper.deleteKuaishouItemListByItemIds(itemIds);
         return kuaishouItemListMapper.deleteKuaishouItemListByItemIds(itemIds);
     }
     }
 
 
-    @Override
+  /*  @Override
     public int addCategoryId() throws KsMerchantApiException {
     public int addCategoryId() throws KsMerchantApiException {
-//        String url = "https://openapi.kwaixiaodian.com";
-//        String appKey = "ks665688320292774929";
-//        String signSecret = "8e21f5bc03b6d2dc63e6256225dac00b";
-//        String accessToken = "ChFvYXV0aC5hY2Nlc3NUb2tlbhJgT28Jn3uMkkU0sSjL_30Jd2X6QCz4B2bs9IsMrIJe1S3J4PhjkaBYIU13FGpBlmy73rx7X-cyNUuuOxKeOloFQeQFZ2Ka8jm_HwDYtqoaoVVm-Y06ILVaPrfs6SjVB84QGhL_b_zNSCZFGYoK2F52yMh0D74iILO5AYTiyqLP-3W1aZ-dql11qIkyhjgvYLXyoNplPgoNKAUwAQ";
+        String url = "https://openapi.kwaixiaodian.com";
+        String appKey = "ks665688320292774929";
+        String signSecret = "8e21f5bc03b6d2dc63e6256225dac00b";
+        String accessToken = "ChFvYXV0aC5hY2Nlc3NUb2tlbhJgT28Jn3uMkkU0sSjL_30Jd2X6QCz4B2bs9IsMrIJe1S3J4PhjkaBYIU13FGpBlmy73rx7X-cyNUuuOxKeOloFQeQFZ2Ka8jm_HwDYtqoaoVVm-Y06ILVaPrfs6SjVB84QGhL_b_zNSCZFGYoK2F52yMh0D74iILO5AYTiyqLP-3W1aZ-dql11qIkyhjgvYLXyoNplPgoNKAUwAQ";
         AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL, APP_KEY, SIGN_SECRET);
         AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL, APP_KEY, SIGN_SECRET);
         OpenDistributionPublicCategoryListRequest request = new OpenDistributionPublicCategoryListRequest();
         OpenDistributionPublicCategoryListRequest request = new OpenDistributionPublicCategoryListRequest();
         request.setAccessToken(ACCESS_TOKEN);
         request.setAccessToken(ACCESS_TOKEN);
@@ -411,7 +412,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         kuaishouItemListMapper.batchCategory(adds);
         kuaishouItemListMapper.batchCategory(adds);
         System.err.println(jsonObject);
         System.err.println(jsonObject);
         return 0;
         return 0;
-    }
+    }*/
 
 
     @Override
     @Override
     public List<JSONObject> getCategoryIds() {
     public List<JSONObject> getCategoryIds() {
@@ -467,12 +468,12 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     }
     }
 
 
     @Override
     @Override
-    public JSONObject getInvalidItemList(Long activityId, Long itemId) {
+    public JSONObject getInvalidItemList(Long activityId, Long itemId, KuaishouAccessToken accessToken) {
         JSONObject returnJson = new JSONObject();
         JSONObject returnJson = new JSONObject();
 
 
-        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL, APP_KEY, SIGN_SECRET);
+        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL, accessToken.getAppKey(), accessToken.getSignSecret());
         OpenDistributionInvestmentActivityInvalidItemListRequest request = new OpenDistributionInvestmentActivityInvalidItemListRequest();
         OpenDistributionInvestmentActivityInvalidItemListRequest request = new OpenDistributionInvestmentActivityInvalidItemListRequest();
-        request.setAccessToken(ACCESS_TOKEN);
+        request.setAccessToken(accessToken.getAccessToken());
         request.setApiMethodVersion(1L);
         request.setApiMethodVersion(1L);
         request.setOffset("0");
         request.setOffset("0");
         request.setItemId(itemId);
         request.setItemId(itemId);
@@ -489,7 +490,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         if ("1".equals(code)) {
         if ("1".equals(code)) {
             returnJson.put("code", 0);
             returnJson.put("code", 0);
             returnJson.put("message", "success");
             returnJson.put("message", "success");
-            returnJson.put("data",jsonObject.getJSONObject("data").getJSONArray("item").getJSONObject(0));
+            returnJson.put("data", jsonObject.getJSONObject("data").getJSONArray("item").getJSONObject(0));
             return returnJson;
             return returnJson;
         } else {
         } else {
             returnJson.put("code", 500);
             returnJson.put("code", 500);
@@ -499,12 +500,12 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     }
     }
 
 
     @Override
     @Override
-    public JSONObject getInvestmentActivityOpenItemList(Long activityId, Long itemId) {
+    public JSONObject getInvestmentActivityOpenItemList(Long activityId, Long itemId, KuaishouAccessToken accessToken) {
         JSONObject returnJson = new JSONObject();
         JSONObject returnJson = new JSONObject();
-        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL,APP_KEY,SIGN_SECRET);
+        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL, accessToken.getAppKey(), accessToken.getSignSecret());
 
 
         OpenDistributionInvestmentActivityOpenItemListRequest request = new OpenDistributionInvestmentActivityOpenItemListRequest();
         OpenDistributionInvestmentActivityOpenItemListRequest request = new OpenDistributionInvestmentActivityOpenItemListRequest();
-        request.setAccessToken(ACCESS_TOKEN);
+        request.setAccessToken(accessToken.getAccessToken());
         request.setApiMethodVersion(1L);
         request.setApiMethodVersion(1L);
 
 
         request.setItemId(itemId);
         request.setItemId(itemId);
@@ -522,7 +523,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         if ("1".equals(code)) {
         if ("1".equals(code)) {
             returnJson.put("code", 0);
             returnJson.put("code", 0);
             returnJson.put("message", "success");
             returnJson.put("message", "success");
-            returnJson.put("data",jsonObject.getJSONObject("data").getJSONArray("activityItemDataList").getJSONObject(0));
+            returnJson.put("data", jsonObject.getJSONObject("data").getJSONArray("activityItemDataList").getJSONObject(0));
             return returnJson;
             return returnJson;
         } else {
         } else {
             returnJson.put("code", 500);
             returnJson.put("code", 500);