浏览代码

妙构思

yumeng 2 年之前
父节点
当前提交
73e3e9c770

+ 3 - 3
ruixuan-admin/src/main/resources/application-dev.yml

@@ -50,9 +50,9 @@ spring:
         url: jdbc:mysql://139.186.165.84:3306/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: hcst
         password: hcst@2020
-      #        url: jdbc:mysql://139.186.27.96:3390/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-      #        username: data
-      #        password: hcst@2021
+#         url: jdbc:mysql://139.186.27.96:3390/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#         username: data
+#         password: hcst@2021
       #        从库数据源
       slave:
         # 从数据源开关/默认关闭

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

@@ -14,6 +14,7 @@ import com.ruixuan.common.core.domain.AjaxResult;
 import com.ruixuan.common.core.page.TableDataInfo;
 import com.ruixuan.common.enums.BusinessType;
 import com.ruixuan.common.utils.Check;
+import com.ruixuan.isc.entity.KuaishouAccessToken;
 import com.ruixuan.isc.entity.KuaishouItemList;
 import com.ruixuan.isc.service.IAccessTokenService;
 import com.ruixuan.isc.service.IKuaishouItemListService;
@@ -51,6 +52,23 @@ public class KuaishouItemListController extends BaseController {
         accessTokenService.refreshAccessToken();
     }
 
+    @GetMapping("/getRegimental")
+    @ApiOperation(value = "团长信息")
+    public JSONObject getRegimental() {
+        JSONObject returnJson = new JSONObject();
+        try {
+            List<JSONObject> list = kuaishouItemListService.getRegimental();
+            returnJson.put("code", 0);
+            returnJson.put("message", "success");
+            returnJson.put("data", list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", -1);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
 
     @GetMapping("/getActivityIds")
     @ApiOperation(value = "活动列表")
@@ -77,14 +95,23 @@ public class KuaishouItemListController extends BaseController {
     @ApiOperation(value = "商品详情预览")
     public JSONObject getItemPreview(
             @ApiParam("活动ID") @RequestParam(value = "activityId", required = false) Long activityId,
-            @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId) {
+            @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId,
+            @ApiParam("团长ID") @RequestParam(value = "regId", required = false) Long regId
+
+    ) {
         JSONObject returnJson = new JSONObject();
         try {
-
             if (Check.isNull(itemId)) {
                 throw new Exception("请传入商品ID");
             }
-            String accessToken = accessTokenService.getAccessToken();
+            if (Check.isNull(regId)) {
+                throw new Exception("请选择所属团");
+            }
+            if (Check.isNull(activityId)) {
+                throw new Exception("请输入活动ID");
+            }
+            KuaishouAccessToken accessToken = accessTokenService.getAccessToken(regId);
+
             if (Check.isNull(accessToken)) {
                 throw new Exception("获取token授权信息为空");
             }
@@ -313,7 +340,7 @@ public class KuaishouItemListController extends BaseController {
             if (Check.isNull(examineName)) {
                 throw new Exception("请传入审核人名称");
             }
-            kuaishouItemListService.batchItemProcess(itemIds, status,examineId,examineName);
+            kuaishouItemListService.batchItemProcess(itemIds, status, examineId, examineName);
             returnJson.put("code", 0);
             returnJson.put("message", "批量审核通过");
         } catch (Exception e) {

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/AccessTokenMapper.java

@@ -5,7 +5,7 @@ import com.ruixuan.isc.entity.KuaishouAccessToken;
 import java.util.List;
 
 public interface AccessTokenMapper {
-    String getAccessToken();
+    KuaishouAccessToken getAccessToken(Long regId);
 
     List<KuaishouAccessToken> getTokenInfos();
 

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemListMapper.java

@@ -49,5 +49,7 @@ public interface KuaishouItemListMapper {
     void removeById(@Param("itemId") Long itemId);
 
     void batchItemProcess(@Param("itemIds") JSONArray itemIds,@Param("status") Integer status,@Param("examineId") Long examineId,@Param("examineName") String examineName);
+
+    List<JSONObject> getRegimental();
 }
 

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

@@ -1,8 +1,10 @@
 package com.ruixuan.isc.service;
 
+import com.ruixuan.isc.entity.KuaishouAccessToken;
+
 public interface IAccessTokenService {
 
-    String getAccessToken();
+    KuaishouAccessToken getAccessToken(Long regId);
 
     void refreshAccessToken();
 }

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

@@ -3,6 +3,7 @@ package com.ruixuan.isc.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kuaishou.merchant.open.api.KsMerchantApiException;
+import com.ruixuan.isc.entity.KuaishouAccessToken;
 import com.ruixuan.isc.entity.KuaishouItemList;
 
 import java.util.List;
@@ -20,13 +21,12 @@ public interface IKuaishouItemListService {
      * @param accessToken
      * @return
      */
-    JSONObject getItemDetail(Long activityId, Long itemId, String accessToken) throws Exception;
+    JSONObject getItemDetail(Long activityId, Long itemId, KuaishouAccessToken accessToken) throws Exception;
 
     KuaishouItemList getItemInfoByItemId(Long itemId);
 
     void insertItem(KuaishouItemList kuaishouItemList);
 
-
     int updateKuaishouItemList(KuaishouItemList kuaishouItemList);
 
     int deleteKuaishouItemListByItemIds(Long[] itemIds);
@@ -44,5 +44,7 @@ public interface IKuaishouItemListService {
     void removeById(Long itemId);
 
     void batchItemProcess(JSONArray itemIds, Integer status,Long examineId,String examineName);
+
+    List<JSONObject> getRegimental();
 }
 

+ 2 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/AccessTokenServiceImpl.java

@@ -26,8 +26,8 @@ public class AccessTokenServiceImpl implements IAccessTokenService {
 
 
     @Override
-    public String getAccessToken() {
-        return accessTokenMapper.getAccessToken();
+    public KuaishouAccessToken getAccessToken(Long regId) {
+        return accessTokenMapper.getAccessToken(regId);
     }
 
     @Override

+ 10 - 5
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -18,7 +18,7 @@ import com.kuaishou.merchant.open.api.response.distribution.OpenDistributionPubl
 import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.KsHttpUtils;
 import com.ruixuan.isc.constants.KuaiShouConstants;
-import com.ruixuan.isc.entity.KuaishouItemCollectSamples;
+import com.ruixuan.isc.entity.KuaishouAccessToken;
 import com.ruixuan.isc.entity.KuaishouItemList;
 import com.ruixuan.isc.entity.KuaishouItemCategory;
 import com.ruixuan.isc.mapper.KuaishouItemListMapper;
@@ -74,13 +74,13 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     }
 
     @Override
-    public JSONObject getItemDetail(Long activityId, Long itemId, String accessToken) throws Exception {
+    public JSONObject getItemDetail(Long activityId, Long itemId, KuaishouAccessToken accessToken) throws Exception {
         // 调用爬虫信息
         JSONObject invaliItemDetail = getInvaliItemDetail(activityId, itemId);
         JSONObject returnJson = new JSONObject();
-        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(KuaiShouConstants.KFX_URL, KuaiShouConstants.APP_KEY, KuaiShouConstants.SIGN_SECRET);
+        AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(KuaiShouConstants.KFX_URL, accessToken.getAppKey(), accessToken.getAppSecret());
         OpenDistributionInvestmentActivityItemDetailRequest request = new OpenDistributionInvestmentActivityItemDetailRequest();
-        request.setAccessToken(accessToken);
+        request.setAccessToken(accessToken.getAccessToken());
         request.setApiMethodVersion(1L);
         request.setActivityId(activityId);
         List<Long> item = new ArrayList<>();
@@ -343,7 +343,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
                             thirdCategory.setCategorySort(3);
                             Long thirdCategoryId = third.getLong("categoryId");
                             adds.add(thirdCategory);
-                            JSONArray fourthChildCategory = third.getJSONArray("childCategory");
+                            JSONArray fourthChildCategory = third.getJSONArray("childCategory ");
                             if (!Check.isNull(fourthChildCategory)) {
                                 for (int l = 0; l < fourthChildCategory.size(); l++) {
                                     JSONObject fourth = fourthChildCategory.getJSONObject(l);
@@ -401,6 +401,11 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         kuaishouItemListMapper.batchItemProcess(itemIds,status,examineId,examineName);
     }
 
+    @Override
+    public List<JSONObject> getRegimental() {
+        return kuaishouItemListMapper.getRegimental();
+    }
+
 
 }
 

+ 2 - 2
ruixuan-live/src/main/resources/mapper/isc/AccessTokenMapper.xml

@@ -9,8 +9,8 @@
     </update>
 
 
-    <select id="getAccessToken" resultType="java.lang.String">
-        select  access_token from kuaishou_access_token limit 1
+    <select id="getAccessToken" resultType="com.ruixuan.isc.entity.KuaishouAccessToken">
+        select  * from kuaishou_access_token where id = #{regId} limit 1
     </select>
     <select id="getTokenInfos" resultType="com.ruixuan.isc.entity.KuaishouAccessToken">
         select *  from kuaishou_access_token

+ 3 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml

@@ -116,6 +116,9 @@
         1,3,4,5,6
         )
     </select>
+    <select id="getRegimental" resultType="com.alibaba.fastjson.JSONObject">
+        select  id as 'id', reg_name as 'regName'  from kuaishou_access_token
+    </select>
 
 
     <insert id="insertItem" parameterType="com.ruixuan.isc.entity.KuaishouItemList">