Browse Source

增加商品关联关系

yumeng 2 years ago
parent
commit
497bf71025

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

@@ -115,7 +115,7 @@ public class KuaishouItemListController extends BaseController {
             if (Check.isNull(accessToken)) {
                 throw new Exception("获取token授权信息为空");
             }
-            returnJson = kuaishouItemListService.getItemDetail(regId,activityId, itemId, accessToken);
+            returnJson = kuaishouItemListService.getItemDetail(regId, activityId, itemId, accessToken);
         } catch (Exception e) {
             e.printStackTrace();
             returnJson.put("code", 500);
@@ -350,5 +350,30 @@ public class KuaishouItemListController extends BaseController {
         return returnJson;
     }
 
+
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
+    @GetMapping("/editRelateByItemId")
+    public JSONObject editRelateByItemId(Long itemId, Long relateId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            KuaishouItemList itemInfoByItemId = kuaishouItemListService.getItemInfoByItemId(itemId);
+            if (Check.isNull(itemInfoByItemId)) {
+                throw new Exception("该商品未绑定");
+            }
+            KuaishouItemList update = new KuaishouItemList();
+            update.setItemId(itemId);
+            update.setRelateId(relateId);
+            int i = kuaishouItemListService.updateKuaishouItemList(update);
+            if (i > 0) {
+                returnJson.put("code", 0);
+                returnJson.put("message", "修改成功");
+            }
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
 }
 

+ 21 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemList.java

@@ -226,6 +226,9 @@ public class KuaishouItemList extends BaseEntity {
     private Integer samplesReceived;
     private Integer samplesPeoples;
 
+    private Long relateId;
+    private Long ruleId;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -550,6 +553,22 @@ public class KuaishouItemList extends BaseEntity {
         this.samplesPeoples = samplesPeoples;
     }
 
+    public Long getRelateId() {
+        return relateId;
+    }
+
+    public void setRelateId(Long relateId) {
+        this.relateId = relateId;
+    }
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+
     @Override
     public String toString() {
         return "KuaishouItemList{" +
@@ -593,6 +612,8 @@ public class KuaishouItemList extends BaseEntity {
                 ", validAmount=" + validAmount +
                 ", samplesReceived=" + samplesReceived +
                 ", samplesPeoples=" + samplesPeoples +
+                ", relateId=" + relateId +
+                ", ruleId=" + ruleId +
                 '}';
     }
 }

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

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

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

@@ -74,9 +74,9 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     }
 
     @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 invaliItemDetail = getInvaliItemDetail(regId, activityId, itemId);
         JSONObject returnJson = new JSONObject();
         AccessTokenKsMerchantClient client = new AccessTokenKsMerchantClient(KuaiShouConstants.KFX_URL, accessToken.getAppKey(), accessToken.getAppSecret());
         OpenDistributionInvestmentActivityItemDetailRequest request = new OpenDistributionInvestmentActivityItemDetailRequest();
@@ -132,7 +132,7 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     }
 
 
-    private JSONObject getInvaliItemDetail(Long regId,Long activityId, Long itemId) throws Exception {
+    private JSONObject getInvaliItemDetail(Long regId, Long activityId, Long itemId) throws Exception {
         JSONObject returnJson = new JSONObject();
         String cookie = supplyChainMapper.getCookie(regId);
         Map<String, Object> params = new HashMap<>();
@@ -283,6 +283,8 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
 
     @Override
     public void insertItem(KuaishouItemList kuaishouItemList) {
+        Long relateId = kuaishouItemListMapper.selectMaxRelateId();
+        kuaishouItemList.setRelateId(relateId + 1);
         kuaishouItemListMapper.insertItem(kuaishouItemList);
         kuaishouItemListMapper.insertItemBindUser(kuaishouItemList.getItemId(), kuaishouItemList.getUserId(), kuaishouItemList.getUserName());
     }
@@ -397,8 +399,8 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
     }
 
     @Override
-    public void batchItemProcess(JSONArray itemIds, Integer status,Long examineId,String examineName) {
-        kuaishouItemListMapper.batchItemProcess(itemIds,status,examineId,examineName);
+    public void batchItemProcess(JSONArray itemIds, Integer status, Long examineId, String examineName) {
+        kuaishouItemListMapper.batchItemProcess(itemIds, status, examineId, examineName);
     }
 
     @Override

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