فهرست منبع

Merge branch 'master' of http://git.tjyourong.com.cn/yumeng/RuiXuan-Cloud

yumeng 1 سال پیش
والد
کامیت
b01f2c9cdd

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

@@ -131,9 +131,9 @@ public class KuaishouItemListController extends BaseController {
                 }
                 returnJson = kuaishouItemListService.getItemDetail(regId, activityId, itemId, accessToken);
             } else if (mediaId == 1) {
-                if(byteDanceItemType == 1 ){ // 常规
+                if (byteDanceItemType == 1) { // 常规
                     returnJson = bytedanceService.addBytedanceColonelActivityProduct(activityId, itemId);
-                }  else if(byteDanceItemType == 2 ){ // 托管
+                } else if (byteDanceItemType == 2) { // 托管
                     returnJson = bytedanceService.trusteeship(activityId, itemId);
                 }
 
@@ -470,5 +470,57 @@ public class KuaishouItemListController extends BaseController {
     }
 
 
+    /**
+     * 招商活动失效商品列表 open.distribution.investment.activity.invalid.item.list
+     */
+    @GetMapping("/getInvalidItemList")
+    @ApiOperation(value = "招商活动失效商品列表")
+    public JSONObject getInvalidItemList(
+            @ApiParam("活动ID") @RequestParam(value = "activityId", required = false) Long activityId,
+            @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(itemId)) {
+                throw new Exception("请传入商品ID");
+            }
+            if (Check.isNull(activityId)) {
+                throw new Exception("请传入活动ID");
+            }
+            return kuaishouItemListService.getInvalidItemList(activityId, itemId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
+    /**
+     * 招商活动失效商品列表 open.distribution.investment.activity.open.item.list
+     */
+    @GetMapping("/getInvestmentActivityOpenItemList")
+    @ApiOperation(value = "团长招商活动已报名商品列表")
+    public JSONObject getInvestmentActivityOpenItemList(
+            @ApiParam("活动ID") @RequestParam(value = "activityId", required = false) Long activityId,
+            @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(itemId)) {
+                throw new Exception("请传入商品ID");
+            }
+            if (Check.isNull(activityId)) {
+                throw new Exception("请传入活动ID");
+            }
+            return kuaishouItemListService.getInvestmentActivityOpenItemList(activityId, itemId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
 }
 

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

@@ -52,5 +52,9 @@ public interface IKuaishouItemListService {
     Long selectMaxRelateId();
 
     JSONObject selectRuleItemByItemId(Long itemId);
+
+    JSONObject getInvalidItemList(Long activityId, Long itemId);
+
+    JSONObject getInvestmentActivityOpenItemList(Long activityId, Long itemId);
 }
 

+ 86 - 12
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -1,26 +1,25 @@
 package com.ruixuan.isc.service.impl;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kuaishou.merchant.open.api.KsMerchantApiException;
 import com.kuaishou.merchant.open.api.client.AccessTokenKsMerchantClient;
 import com.kuaishou.merchant.open.api.common.utils.GsonUtils;
+import com.kuaishou.merchant.open.api.request.distribution.OpenDistributionInvestmentActivityInvalidItemListRequest;
 import com.kuaishou.merchant.open.api.request.distribution.OpenDistributionInvestmentActivityItemDetailRequest;
+import com.kuaishou.merchant.open.api.request.distribution.OpenDistributionInvestmentActivityOpenItemListRequest;
 import com.kuaishou.merchant.open.api.request.distribution.OpenDistributionPublicCategoryListRequest;
+import com.kuaishou.merchant.open.api.response.distribution.OpenDistributionInvestmentActivityInvalidItemListResponse;
 import com.kuaishou.merchant.open.api.response.distribution.OpenDistributionInvestmentActivityItemDetailResponse;
+import com.kuaishou.merchant.open.api.response.distribution.OpenDistributionInvestmentActivityOpenItemListResponse;
 import com.kuaishou.merchant.open.api.response.distribution.OpenDistributionPublicCategoryListResponse;
 import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.KsHttpUtils;
 import com.ruixuan.isc.constants.KuaiShouConstants;
 import com.ruixuan.isc.entity.KuaishouAccessToken;
-import com.ruixuan.isc.entity.KuaishouItemList;
 import com.ruixuan.isc.entity.KuaishouItemCategory;
+import com.ruixuan.isc.entity.KuaishouItemList;
 import com.ruixuan.isc.mapper.KuaishouItemListMapper;
 import com.ruixuan.isc.mapper.SupplyChainMapper;
 import com.ruixuan.isc.service.IKuaishouItemListService;
@@ -28,6 +27,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -44,6 +48,11 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     @Autowired
     private SupplyChainMapper supplyChainMapper;
 
+    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
     public List<KuaishouItemList> getItemList(Map<String, Object> requestMap) {
@@ -335,13 +344,13 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
 
     @Override
     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";
-        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(url, appKey, signSecret);
+//        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);
         OpenDistributionPublicCategoryListRequest request = new OpenDistributionPublicCategoryListRequest();
-        request.setAccessToken(accessToken);
+        request.setAccessToken(ACCESS_TOKEN);
         request.setApiMethodVersion(1L);
         OpenDistributionPublicCategoryListResponse response = client.execute(request);
         JSONObject jsonObject = JSONObject.parseObject(GsonUtils.toJSON(response));
@@ -457,6 +466,71 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         return kuaishouItemListMapper.selectRuleItemByItemId(itemId);
     }
 
+    @Override
+    public JSONObject getInvalidItemList(Long activityId, Long itemId) {
+        JSONObject returnJson = new JSONObject();
+
+        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL, APP_KEY, SIGN_SECRET);
+        OpenDistributionInvestmentActivityInvalidItemListRequest request = new OpenDistributionInvestmentActivityInvalidItemListRequest();
+        request.setAccessToken(ACCESS_TOKEN);
+        request.setApiMethodVersion(1L);
+        request.setOffset("0");
+        request.setItemId(itemId);
+        request.setActivityId(activityId);
+        request.setLimit(20);
+        OpenDistributionInvestmentActivityInvalidItemListResponse response = null;
+        try {
+            response = client.execute(request);
+        } catch (KsMerchantApiException e) {
+            e.printStackTrace();
+        }
+        JSONObject jsonObject = JSONObject.parseObject(GsonUtils.toJSON(response));
+        String code = jsonObject.getString("code");
+        if ("1".equals(code)) {
+            returnJson.put("code", 0);
+            returnJson.put("message", "success");
+            returnJson.put("data",jsonObject.getJSONObject("data").getJSONArray("item").getJSONObject(0));
+            return returnJson;
+        } else {
+            returnJson.put("code", 500);
+            returnJson.put("message", returnJson);
+            return returnJson;
+        }
+    }
+
+    @Override
+    public JSONObject getInvestmentActivityOpenItemList(Long activityId, Long itemId) {
+        JSONObject returnJson = new JSONObject();
+        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(URL,APP_KEY,SIGN_SECRET);
+
+        OpenDistributionInvestmentActivityOpenItemListRequest request = new OpenDistributionInvestmentActivityOpenItemListRequest();
+        request.setAccessToken(ACCESS_TOKEN);
+        request.setApiMethodVersion(1L);
+
+        request.setItemId(itemId);
+        request.setActivityId(activityId);
+        request.setLimit(20);
+
+        OpenDistributionInvestmentActivityOpenItemListResponse response = null;
+        try {
+            response = client.execute(request);
+        } catch (KsMerchantApiException e) {
+            e.printStackTrace();
+        }
+        JSONObject jsonObject = JSONObject.parseObject(GsonUtils.toJSON(response));
+        String code = jsonObject.getString("code");
+        if ("1".equals(code)) {
+            returnJson.put("code", 0);
+            returnJson.put("message", "success");
+            returnJson.put("data",jsonObject.getJSONObject("data").getJSONArray("activityItemDataList").getJSONObject(0));
+            return returnJson;
+        } else {
+            returnJson.put("code", 500);
+            returnJson.put("message", returnJson);
+            return returnJson;
+        }
+    }
+
 
 }