瀏覽代碼

达人ID lei xing

zhaoxian 2 年之前
父節點
當前提交
2034655dde

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

@@ -103,7 +103,7 @@ public interface KuaishouItemCollectSamplesMapper {
 
     Integer getSampleCountByUserId(@Param("userList") List<Long> userList, @Param("userType") Integer userType, @Param("status") Integer status);
 
-    JSONObject queryTheNumberOfCompletedJobs(@Param("promoterIds") List<Long> promoterIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    JSONObject queryTheNumberOfCompletedJobs(@Param("promoterIds") List<String> promoterIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
     List<JSONObject> selectPromoterInfo(@Param("map") Map<String, String> map);
 

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

@@ -64,7 +64,7 @@ public interface KuaishouPromoterMapper {
 
     void insertKuaishouPromoterRecord(JSONObject record);
 
-    List<Long> selectPromoterIdList(@Param("userList") List<Long> userList);
+    List<String> selectPromoterIdList(@Param("userList") List<Long> userList);
 
     JSONObject getgetMonthPromoterTotal(@Param("userList") List<Long> userList, @Param("start") String start, @Param("end") String end);
 

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

@@ -73,9 +73,9 @@ public interface SupplyChainMapper {
 
     String getCookie(Long regId);
 
-    JSONObject selectOrderInfo(@Param("promoterIds") List<Long> promoterIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    JSONObject selectOrderInfo(@Param("promoterIds") List<String> promoterIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    JSONObject selectOrderRate(@Param("promoterIds") List<Long> promoterIds, @Param("itemIds") List<Long> itemIds, @Param("statDate") Long statDate, @Param("endDate") Long endDate);
+    JSONObject selectOrderRate(@Param("promoterIds") List<String> promoterIds, @Param("itemIds") List<Long> itemIds, @Param("statDate") Long statDate, @Param("endDate") Long endDate);
 
     List<JSONObject> getMonthOrderAmount(Map<String, Object> map);
 

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

@@ -58,7 +58,7 @@ public interface IKuaishouPromoterService {
 
     KuaishouPromoter getOnlyPromoterInfo(String promoterId);
 
-    List<Long> selectPromoterIdList(List<Long> userList);
+    List<String> selectPromoterIdList(List<Long> userList);
 
     JSONObject getgetMonthPromoterTotal(List<Long> userList, String start, String end);
 

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

@@ -96,9 +96,9 @@ public interface ISupplyChainService {
     //认领列表导出
     List<JSONObject> exportUserItemDetail(Map<String, Object> requestMap);
 
-    JSONObject selectOrderInfo(List<Long> promoterIds, String startDate, String endDate);
+    JSONObject selectOrderInfo(List<String> promoterIds, String startDate, String endDate);
 
-    JSONObject selectOrderRate(List<Long> promoterIds, List<Long> itemIds, Long statDate, Long endDate);
+    JSONObject selectOrderRate(List<String> promoterIds, List<Long> itemIds, Long statDate, Long endDate);
 
     List<JSONObject> getMonthOrderAmount(Map<String, Object> map);
 

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

@@ -445,7 +445,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
     //渠道数据
     private JSONObject getOrderDataByChannel(List<Long> userList, String startDate, String endDate) {
         JSONObject data = new JSONObject();
-        List<Long> promoterIds = null;
+        List<String> promoterIds = null;
         if (Check.isNotNull(userList)) {
             promoterIds = promoterService.selectPromoterIdList(userList);
         }
@@ -525,7 +525,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         return data;
     }
 
-    private JSONObject getOrderRate(String startDate, String endDate, int hour, List<Long> promoterIds, List<Long> itemIds) {
+    private JSONObject getOrderRate(String startDate, String endDate, int hour, List<String> promoterIds, List<Long> itemIds) {
         Long startHourTemp = DateUtils.getStartLongTime(startDate); // startDate开始时间戳
         Long endHourTemp = DateUtils.getNowEndHourTemp(endDate, hour); // endDate结束时间戳
         return supplyChainService.selectOrderRate(promoterIds, itemIds, startHourTemp, endHourTemp);
@@ -692,7 +692,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
     // 渠道—数据分析
     private JSONObject getDataAnalysisByChannel(List<Long> userList, String startDate, String endDate) {
         JSONObject data = new JSONObject();
-        List<Long> promoterIds = null;
+        List<String> promoterIds = null;
         if (Check.isNotNull(userList)) {
             promoterIds = promoterService.selectPromoterIdList(userList);
         }

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

@@ -464,7 +464,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
     }
 
     @Override
-    public List<Long> selectPromoterIdList(List<Long> userList) {
+    public List<String> selectPromoterIdList(List<Long> userList) {
         return kuaishouPromoterMapper.selectPromoterIdList(userList);
     }
 

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

@@ -206,12 +206,12 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
     }
 
     @Override
-    public JSONObject selectOrderInfo(List<Long> promoterIds, String startDate, String endDate) {
+    public JSONObject selectOrderInfo(List<String> promoterIds, String startDate, String endDate) {
         return supplyChainMapper.selectOrderInfo(promoterIds, startDate, endDate);
     }
 
     @Override
-    public JSONObject selectOrderRate(List<Long> promoterIds, List<Long> itemIds, Long statDate, Long endDate) {
+    public JSONObject selectOrderRate(List<String> promoterIds, List<Long> itemIds, Long statDate, Long endDate) {
         return supplyChainMapper.selectOrderRate(promoterIds, itemIds, statDate, endDate);
     }
 

+ 1 - 1
ruixuan-live/src/main/resources/mapper/isc/KuaishouPromoterMapper.xml

@@ -193,7 +193,7 @@
         Where t1.promoter_id = #{promoterId}
     </select>
 
-    <select id="selectPromoterIdList" resultType="Long">
+    <select id="selectPromoterIdList" resultType="String">
         select promoter_id
         from kuaishou_promoter
         <where>