增加对白条事故订单的支持

src/main/java/cn/gq/financial/app/DifCheckOutAPP.java

@@ -31,8 +31,8 @@ public class DifCheckOutAPP {
     private static ClassPathXmlApplicationContext context = null;
 
     public static void main(String[] args) throws Exception {
-        List<Bill> bills = CountTotal.getBillsFromFile("E:\\financial-system-data\\umpay\\baitiao", YeepayBill.class, "联动-白条账户", 12);
-        getSpringContext().getBean(DifCheckOutHandler.class).checkDif(bills,"E:\\financial-system-data\\umpay\\baitiao\\丢失的.txt");
+        List<Bill> bills = CountTotal.getBillsFromFile("E:\\financial-system-data\\yeepay\\baitiao", YeepayBill.class, "易宝-白条账户", 8);
+        getSpringContext().getBean(DifCheckOutHandler.class).checkDif(bills,"E:\\financial-system-data\\yeepay\\baitiao\\丢失的2.txt");
         closeContext();
     }
 

src/main/java/cn/gq/financial/app/RepayFinancialAPP.java

@@ -31,7 +31,7 @@ public class RepayFinancialAPP {
 	 */
 	static Integer currentMonth = 8;
 
-	static PayType payType = PayType.YeePay_Xjd;
+	static PayType payType = PayType.YeePay_BaiTiao;
 
 	static AbstractBills bill;
 

src/main/java/cn/gq/financial/app/handler/DifCheckOutHandler.java

@@ -69,7 +69,7 @@ public class DifCheckOutHandler {
                 }
             }else {
 //                res.add("订单-->".concat(bill.getOrderId()).concat(" 详细丢失了,交易时间-->").concat(DateFormatUtils.ISO_DATE_FORMAT.format(bill.getTrandingDate())));
-                res.add(((UMPayBill) bill).getSrcStr());
+                res.add(((YeepayBill) bill).getSrcStr());
             }
         });
 

src/main/java/cn/gq/financial/db/xyqb/dao/ExportExcelMapper.java

@@ -28,6 +28,9 @@ public interface ExportExcelMapper {
 	
 	public List<BaitiaoExpEntity> baitiaoRepayExport(@Param("list")List<Long> list);
 
+    public List<BaitiaoExpEntity> baitiaoShiGuRepayExport(@Param("list")List<Long> list);
+
+
 	public List<BaitiaoExpEntity> baitiaoRepayExport1(@Param("list")List<Long> ids);
 
 	public List<ExportExcelEntity> getInfoByOrderIds1(@Param("list")List<Long> repaymentPlanIds);

src/main/java/cn/gq/financial/db/xyqb/mapping/ExportExcelMapper.xml

@@ -430,6 +430,49 @@
         </foreach>
     </select>
 
+
+    <select id="baitiaoShiGuRepayExport" resultMap="baitiaoRepayExpResultMap">
+        SELECT
+        brp.id AS repayment_plan_id,
+        bm.`remark` AS merchant_name,
+        bm.id AS merchant_id,
+        bo.`order_no` AS order_no,
+        ud.`name` AS user_name,
+        ud.`id_no` AS id_no,
+        ud.`phone_no` AS phone_no,
+        bo.`created_at` AS order_time,
+        bo.`order_amount` AS order_amount,
+        CASE bo.repay_term
+        WHEN 0 THEN 1
+        WHEN 1 THEN 3
+        WHEN 2 THEN 6
+        WHEN 3 THEN 9
+        WHEN 4 THEN 12
+        END AS contract_term,
+        brp.`term_no` AS curr_term_no,
+        brp.`deadline` AS deadline,
+        brp.`repaid_at` AS repaid_at,
+        brp.`required_repayment` AS required_repayment,
+        brp.`origin_amount` AS principal_amount,
+        brp.`interest_amount` AS interest_amount,
+        brp.`overstay_amount` AS overdue_fee,
+        brp.`reduce_amount` AS reduce_amount,
+        brp.`current_repayment` AS current_repayment,
+        brp.pay_center_order_no AS pay_center_order_no
+        FROM baitiao_repayment_plan_mall_shigu brp
+        JOIN baitiao_order_mall_shigu bo
+        JOIN baitiao_merchant bm
+        JOIN user_detail ud
+        ON bo.id= brp.`order_id`
+        AND bm.id=bo.`merchant_id`
+        AND ud.`user_id` = brp.`user_id`
+        WHERE
+        brp.`id` IN
+        <foreach collection="list" item="listItem" open="(" close=")" separator=",">
+            #{listItem}
+        </foreach>
+    </select>
+
     <!-- 白条帐单查询 -->
     <select id="baitiaoBillRepayExport" resultMap="baitiaoRepayExpResultMap">
         SELECT

src/main/java/cn/gq/financial/service/BaitiaoOnlineDetailService.java

@@ -223,6 +223,7 @@ public class BaitiaoOnlineDetailService implements DetailService {
             if (StringUtils.equals(BIZ_TYPE_BAITIAO, bizType)) {
                 if (baitiaoOrderIds.size() > 0) {
                     baitiaoExpEntities.addAll(exportExcelMapper.baitiaoRepayExport(baitiaoOrderIds));
+                    baitiaoExpEntities.addAll(exportExcelMapper.baitiaoShiGuRepayExport(baitiaoOrderIds));
                 }
             }
             if (StringUtils.equals(BIZ_TYPE_BILL_BAITIAO, bizType)) {
@@ -230,6 +231,8 @@ public class BaitiaoOnlineDetailService implements DetailService {
                     baitiaoExpEntities.addAll(exportExcelMapper.baitiaoBillRepayExport(payCenterOrders));
                 }
             }
+
+
         } else {
             baitiaoExpEntities = new ArrayList<>();
             int group = size / item_size;
@@ -238,6 +241,10 @@ public class BaitiaoOnlineDetailService implements DetailService {
                 if (StringUtils.equals(BIZ_TYPE_BAITIAO, bizType)) {
                     List<Long> subList = baitiaoOrderIds.subList(i * item_size, (i + 1) * item_size);
                     List<BaitiaoExpEntity> list = exportExcelMapper.baitiaoRepayExport(subList);
+                    if(list.size()<subList.size()){
+                        List<BaitiaoExpEntity> list2 = exportExcelMapper.baitiaoShiGuRepayExport(subList);
+                        baitiaoExpEntities.addAll(list2);
+                    }
                     baitiaoExpEntities.addAll(list);
                 }
                 if (StringUtils.equals(BIZ_TYPE_BILL_BAITIAO, bizType)) {
@@ -251,6 +258,10 @@ public class BaitiaoOnlineDetailService implements DetailService {
                     List<Long> subList = baitiaoOrderIds.subList(i * item_size, baitiaoOrderIds.size());
                     List<BaitiaoExpEntity> list = exportExcelMapper.baitiaoRepayExport(subList);
                     baitiaoExpEntities.addAll(list);
+                    if(list.size()<subList.size()){
+                        List<BaitiaoExpEntity> list2 = exportExcelMapper.baitiaoShiGuRepayExport(subList);
+                        baitiaoExpEntities.addAll(list2);
+                    }
                 }
                 if (StringUtils.equals(BIZ_TYPE_BILL_BAITIAO, bizType) && baitiaoOrderIds.size() >0) {
                     List<String> subList = payCenterOrders.subList(i * item_size, baitiaoOrderIds.size());