引入fastjson, 增加逾期天数计算

infintech-executors/executor-collection-dispatcher/pom.xml

@@ -91,6 +91,11 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
         <!-- xxl-job-core -->
         <dependency>
             <groupId>com.xuxueli</groupId>

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

@@ -62,11 +62,31 @@ public class CronCollectionServiceImpl implements CronCollectionService
 				String userRealName = (String) tmpMap.get("real_name");
 				s.setFkSystemUser(userId);
 				s.setCollectorLoginName(userRealName);
+				long ll = dateSubstract(new Date(), s.getRepaymentDate());
+				s.setOverdueDayCount(Short.valueOf("" + ll));
+				String tmp = "";
+				tmp += s.getDeadline();
+				if("0".equals(s.getUnit().trim())) {
+					//天
+					tmp += " Day";
+					
+				} else if ("1".equals(s.getUnit().trim())) {
+					//月
+					tmp += " Month";
+				} else {
+					throw new InfintechException("getUnit error! unit:" + s.getUnit());
+				}
+				s.setProjectPeriod(tmp);
 				a++;
 			}
 			//拼接List
 			resultList.addAll(list);
 		}
+		if (resultList.size()==0) {
+			throw new InfintechException("resultList empty!");
+		}
+		XxlJobLogger.log("new");
+		XxlJobLogger.log(resultList.get(0).toString());
 		collectionMapper.insertBatch(resultList);
 		
 	}

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

@@ -3,6 +3,8 @@ package com.infincash.cron.collection.table;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.alibaba.fastjson.JSON;
+
 public class TBizCollection {
     private Long id;
 
@@ -24,6 +26,8 @@ public class TBizCollection {
 
     private Integer deadline;
     
+    private String projectPeriod;
+    
     private String unit;
 
     private BigDecimal firstPriceLoan;
@@ -237,4 +241,20 @@ public class TBizCollection {
 	{
 		this.unit = unit;
 	}
+	
+	public String getProjectPeriod()
+	{
+		return projectPeriod;
+	}
+
+	public void setProjectPeriod(String projectPeriod)
+	{
+		this.projectPeriod = projectPeriod;
+	}
+
+	@Override
+	public String toString() {
+		return JSON.toJSONString(this);
+	}
+
 }

infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/TBizCollectionRecordMapper.xml

@@ -34,10 +34,13 @@
         t_u.login_name user_login_name, 
         t_ub.real_name user_real_name, 
         t_u.phone user_phone,
+        t_biz.user_id fk_t_user,
+        t_biz.fk_t_project,
         t_biz.loan_time, 
         t_biz.deadline, 
         t_biz.unit, 
-        t_biz.first_price_loan, t_biz.repayment_date
+        t_biz.first_price_loan, 
+        t_biz.repayment_date
     from
     (
         select
@@ -67,51 +70,31 @@
  
   <insert id="insertBatch" parameterType="com.infincash.cron.collection.table.TBizCollection">
     insert into t_biz_collection_record
+    
+    "collectorLoginName": "HARRY",
+    "deadline": 1,
+    "firstPriceLoan": 1800000.00,
+    "fkSystemUser": "00101519376707262349",
+    "loanTime": 1511663497000,
+    "projectNumber": "GO20171125435400",
+    "repaymentDate": 1514217600000,
+    "unit": "1",
+    "userLoginName": "MF_qmjoqz",
+    "userPhone": "085934509604",
+    "userRealName": "Sandhi Trisnadi"
+    
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="fkTProject != null">
         fk_t_project,
-      </if>
-      <if test="fkTUser != null">
         fk_t_user,
-      </if>
-      <if test="fkSystemUser != null">
         fk_system_user,
-      </if>
-      <if test="waitOrRecord != null">
-        wait_or_record,
-      </if>
-      <if test="projectNumber != null">
         project_number,
-      </if>
-      <if test="userLoginName != null">
         user_login_name,
-      </if>
-      <if test="userRealName != null">
         user_real_name,
-      </if>
-      <if test="userPhone != null">
         user_phone,
-      </if>
-      <if test="loanTime != null">
         loan_time,
-      </if>
-      <if test="projectPeriod != null">
         project_period,
-      </if>
-      <if test="firstPriceLoan != null">
         first_price_loan,
-      </if>
+        repayment_date
-      <if test="repaymentDate != null">
-        repayment_date,
-      </if>
-      <if test="overdueDayCount != null">
-        overdue_day_count,
-      </if>
-      <if test="fkTBizCollectionOverdueBucketIntervalId != null">
-        fk_t_biz_collection_overdue_bucket_interval_id,
       </if>
       <if test="collectorLoginName != null">
         collector_login_name,
@@ -141,9 +124,6 @@
     VALUES
     <foreach collection ="list" item="oneItem" index= "index" separator =",">
     (
-      <if test="id != null">
-        #{oneItem.id,jdbcType=BIGINT},
-      </if>
       <if test="fkTProject != null">
         #{oneItem.fkTProject,jdbcType=VARCHAR},
       </if>

infintech-executors/pom.xml

@@ -17,6 +17,7 @@
     
     <properties>
         <guava.version>23.6-jre</guava.version>
+        <fastjson.version>1.2.46</fastjson.version>
     </properties>
 
 </project>