yumeng 11 months ago
parent
commit
3072a59991

+ 2 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouRewardBaseInfo.java

@@ -3,6 +3,7 @@ package com.ruixuan.isc.entity;
 
 import java.math.BigDecimal;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -246,9 +247,8 @@ public class KuaishouRewardBaseInfo extends BaseEntity {
     }
 
 
-
     public KuaishouRewardBaseInfo(JSONObject obj) {
-        this.setPromoterId(obj.getLong("0"));//达人ID
+        this.setPromoterId(obj.getString("0"));//达人ID
         this.setPromoterName(obj.getString("1"));//达人昵称
         this.setItemId(obj.getLong("2"));//商品id
         this.setItemTitle(obj.getString("3"));//商品名称

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

@@ -66,7 +66,6 @@ public interface KuaishouRewardBaseInfoMapper {
 
     String getItemName(@Param("itemId") Long itemId);
 
-
     String getPromoterName(@Param("promoterId") String promoterId);
 
     JSONObject getTotal(KuaishouRewardBaseInfo kuaishouRewardBaseInfo);

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

@@ -2,7 +2,9 @@ package com.ruixuan.isc.service;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.ruixuan.common.core.domain.ResultResponse;
 import com.ruixuan.isc.entity.KuaishouRewardBaseInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -63,9 +65,9 @@ public interface IKuaishouRewardBaseInfoService {
 
     Integer checkData(Long itemId, String promoterId, String statDate);
 
-    JSONObject getInfo(Long itemId,String promoterId);
+    JSONObject getInfo(Long itemId, String promoterId);
 
-   JSONObject getTotal(KuaishouRewardBaseInfo kuaishouRewardBaseInfo);
+    JSONObject getTotal(KuaishouRewardBaseInfo kuaishouRewardBaseInfo);
 
 
     ResultResponse insertRewardBaseInfoByExcel(MultipartFile file) throws Exception;

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouRewardBaseInfoServiceImpl.java

@@ -120,7 +120,7 @@ public class KuaishouRewardBaseInfoServiceImpl implements IKuaishouRewardBaseInf
     public JSONObject getTotal(KuaishouRewardBaseInfo kuaishouRewardBaseInfo) {
         return kuaishouRewardBaseInfoMapper.getTotal(kuaishouRewardBaseInfo);
     }
-}
+
 
     @Override
     public ResultResponse insertRewardBaseInfoByExcel(MultipartFile file) throws Exception {