修复

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.infincash.cron.collection;
 
-import static com.infincash.util.Jdk8DateUtils.*;
+import static com.infincash.util.Jdk8DateUtils.dateSubstract;
+import static com.infincash.util.Jdk8DateUtils.getDateAfter;
 
 import java.util.Date;
 import java.util.List;
@@ -10,16 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.infincash.cron.collection.mapper.TBizCollectionMapper;
 import com.infincash.cron.collection.mapper.TBizCollectionOverdueBucketMapper;
-import com.infincash.cron.collection.mapper.TBizCollectionRecordMapper;
+import com.infincash.cron.collection.table.TBizCollection;
 import com.infincash.cron.collection.table.TBizCollectionOverdueBucket;
-import com.infincash.cron.collection.table.TBizCollectionRecord;
 import com.xxl.job.core.log.XxlJobLogger;
 
 public class CronCollectionServiceImpl implements CronCollectionService
 {
 	@Autowired
-	TBizCollectionRecordMapper recordMapper;
+	TBizCollectionMapper recordMapper;
 
 	@Autowired
 	TBizCollectionOverdueBucketMapper bucketMapper;
@@ -29,7 +30,7 @@ public class CronCollectionServiceImpl implements CronCollectionService
 	{
 		//90天以上的是坏账
 		String badDebtDay = getDateAfter(-90);
-		List<TBizCollectionRecord> rList = recordMapper.queryAll(badDebtDay);
+		List<TBizCollection> rList = recordMapper.queryAll(badDebtDay);
 		if (rList == null || rList.size() == 0)
 		{
 			throw new InfintechException("recordMapper.queryAll(badDebtDay) empty! badDebtDay: " + badDebtDay);
@@ -42,11 +43,11 @@ public class CronCollectionServiceImpl implements CronCollectionService
 		getWhichBucket(bList, rList);
 	}
 
-	private Map<String, List<TBizCollectionRecord>> getWhichBucket(List<TBizCollectionOverdueBucket> bList, List<TBizCollectionRecord> rList)
+	private Map<String, List<TBizCollection>> getWhichBucket(List<TBizCollectionOverdueBucket> bList, List<TBizCollection> rList)
 	{
 		// <k-v>:= <system_role_id - List<record>>
-		Map<String, List<TBizCollectionRecord>> listMap = Maps.newHashMap();
+		Map<String, List<TBizCollection>> listMap = Maps.newHashMap();
-		for (TBizCollectionRecord r : rList)
+		for (TBizCollection r : rList)
 		{
 			Date d        = r.getRepaymentDate();
 			Date now      = new Date();
@@ -60,7 +61,7 @@ public class CronCollectionServiceImpl implements CronCollectionService
 				{
 					//取system_role
 					String systemRoleId = bList.get(i).gettSystemRoleId();
-					List<TBizCollectionRecord> tmpList = listMap.get(systemRoleId);
+					List<TBizCollection> tmpList = listMap.get(systemRoleId);
 					if (tmpList == null) {
 						tmpList = Lists.newLinkedList();
 						tmpList.add(r);

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/mapper/CronCollectionMapper.java

@@ -1,17 +0,0 @@
-package com.infincash.cron.collection.mapper;
-
-import com.infincash.cron.collection.table.TBizCollectionRecord;
-
-public interface CronCollectionMapper {
-    int deleteByPrimaryKey(Long id);
-
-    int insert(TBizCollectionRecord record);
-
-    int insertSelective(TBizCollectionRecord record);
-
-    TBizCollectionRecord selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(TBizCollectionRecord record);
-
-    int updateByPrimaryKey(TBizCollectionRecord record);
-}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/mapper/TBizCollectionRecordMapper.java

@@ -2,20 +2,20 @@ package com.infincash.cron.collection.mapper;
 
 import java.util.List;
 
-import com.infincash.cron.collection.table.TBizCollectionRecord;
+import com.infincash.cron.collection.table.TBizCollection;
 
-public interface TBizCollectionRecordMapper {
+public interface TBizCollectionMapper {
-	List<TBizCollectionRecord> queryAll(String badDebtDay);
+	List<TBizCollection> queryAll(String badDebtDay);
 	
     int deleteByPrimaryKey(Long id);
 
-    int insert(TBizCollectionRecord record);
+    int insert(TBizCollection record);
 
-    int insertSelective(TBizCollectionRecord record);
+    int insertSelective(TBizCollection record);
 
-    TBizCollectionRecord selectByPrimaryKey(Long id);
+    TBizCollection selectByPrimaryKey(Long id);
 
-    int updateByPrimaryKeySelective(TBizCollectionRecord record);
+    int updateByPrimaryKeySelective(TBizCollection record);
 
-    int updateByPrimaryKey(TBizCollectionRecord record);
+    int updateByPrimaryKey(TBizCollection record);
 }