Browse Source

Merge remote-tracking branch 'origin/test' into test

zhaoxian 2 years ago
parent
commit
0246ceb6b9

+ 25 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -275,6 +275,31 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     }
 
 
+
+    @PutMapping("/update")
+    public JSONObject update(@RequestBody KuaishouItemCollectSamples kuaishouItemCollectSamples) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            Long id = kuaishouItemCollectSamples.getId();
+            if (Check.isNull(id)) {
+                throw new Exception("id不能为空");
+            }
+
+            int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
+            returnJson.put("code", 0);
+            returnJson.put("message", "修改成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", -1);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+    
+    
+    
+
+
     @GetMapping("/detail")
     public JSONObject detail(Long id) {
         JSONObject returnJson = new JSONObject();

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

@@ -91,7 +91,7 @@ public class KuaishouItemListController extends BaseController {
             returnJson = kuaishouItemListService.getItemDetail(activityId, itemId, accessToken);
         } catch (Exception e) {
             e.printStackTrace();
-            returnJson.put("code", -1);
+            returnJson.put("code", 500);
             returnJson.put("message", e.getMessage());
         }
         return returnJson;
@@ -166,7 +166,7 @@ public class KuaishouItemListController extends BaseController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            returnJson.put("code", -1);
+            returnJson.put("code", 500);
             returnJson.put("message", e.getMessage());
         }
         return returnJson;
@@ -244,5 +244,26 @@ public class KuaishouItemListController extends BaseController {
     }
 
 
+    @GetMapping("/getItemDetailByItemId")
+    public JSONObject getItemDetail(Long itemId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(itemId)) {
+                throw new Exception("请输入商品ID");
+            }
+            KuaishouItemList json = kuaishouItemListService.getItemInfoByItemId(itemId);
+            returnJson.put("code", 0);
+            returnJson.put("message", "success");
+            returnJson.put("itemJson", json);
+            returnJson.put("judgeStatus", 1);
+        } catch (Exception e) {
+
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+
+        return returnJson;
+    }
+
 }
 

+ 3 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemList.java

@@ -2,6 +2,7 @@ package com.ruixuan.isc.entity;
 
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
 
 public class KuaishouItemList extends BaseEntity {
 
@@ -218,8 +219,9 @@ public class KuaishouItemList extends BaseEntity {
     @Excel(name = "商品相信信息")
     private String detailUrl;
 
-
+    @Transient
     private Long validOrderNum;
+    @Transient
     private Long validAmount;
     private Integer samplesReceived;
     private Integer samplesPeoples;

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

@@ -40,5 +40,7 @@ public interface KuaishouItemListMapper {
     void updateCount(@Param("itemId") Long itemId, @Param("sampleCount") Integer sampleCount, @Param("userCount") Integer userCount);
 
     List<Long> getActivityIds(@Param("userId") Long userId);
+
+    List<JSONObject> selectItemInfo(@Param("map") Map<Long, Long> map);
 }
 

+ 28 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -5,6 +5,7 @@ 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;
@@ -17,6 +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.KuaishouItemList;
 import com.ruixuan.isc.entity.KuaishouItemCategory;
 import com.ruixuan.isc.mapper.KuaishouItemListMapper;
@@ -45,7 +47,30 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
 
     @Override
     public List<KuaishouItemList> getItemList(Map<String, Object> requestMap) {
-        return kuaishouItemListMapper.getItemList(requestMap);
+        List<KuaishouItemList> itemList = kuaishouItemListMapper.getItemList(requestMap);
+        Map<Long, JSONObject> dataMap = new HashMap<>();
+        if (!Check.isNull(itemList)) {
+            Map<Long, Long> map = new HashMap<>();
+            for (KuaishouItemList item : itemList) {
+                map.put(item.getItemId(), item.getItemId());
+            }
+            List<JSONObject> itemInfoList = kuaishouItemListMapper.selectItemInfo(map);
+            for (int i = 0; i < itemInfoList.size(); i++) {
+                JSONObject jsonObject = itemInfoList.get(i);
+                dataMap.put(jsonObject.getLong("itemId"), jsonObject);
+            }
+        }
+        if (!Check.isNull(itemList)) {
+            for (KuaishouItemList item : itemList) {
+                Long itemId = item.getItemId();
+                JSONObject jsonObject = dataMap.get(itemId);
+                if (!Check.isNull(jsonObject)) {
+                    item.setValidAmount(jsonObject.getLong("validAmount"));
+                    item.setValidOrderNum(jsonObject.getLong("validOrderNum"));
+                }
+            }
+        }
+        return itemList;
     }
 
     @Override
@@ -71,7 +96,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         if (code == 1 && subCode == 1) {
             JSONArray data = json.getJSONArray("data");
             if (Check.isNull(data)) {
-                returnJson.put("code", -1);
+                returnJson.put("code", 500);
                 returnJson.put("message", "数据查询失败");
                 return returnJson;
             }
@@ -99,7 +124,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         } else if (code != 1) { // 商品下线
             return invaliItemDetail;
         } else {
-            returnJson.put("code", -1);
+            returnJson.put("code", 500);
             returnJson.put("message", "数据查询失败");
         }
         log.info("获取商品信息回,活动ID:{},商品ID:{},数据:{}", activityId, itemId, returnJson);

File diff suppressed because it is too large
+ 10 - 9
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml