增加帐单白条逻辑处理

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

@@ -22,11 +22,9 @@ import java.io.IOException;
 import java.nio.file.Paths;
 
 public class RepayFinancialAPP {
-	private static final Logger LOGGER = LoggerFactory.getLogger(RepayFinancialAPP.class);
-
 	static final String CONFIG_LOCAL = "applicationContext.xml";
-
 	static final String ROOT_DIR = "E:\\financial-system-data\\";
+	private static final Logger LOGGER = LoggerFactory.getLogger(RepayFinancialAPP.class);
 	/**
 	 * Tip: 对帐单时 只需修改currentMonth和payType
 	 * currentMonth 当前是几月就输入几 无须减1 后续代码里面已经处理
@@ -38,10 +36,8 @@ public class RepayFinancialAPP {
 	static AbstractBills bill;
 
 	static String path = "";
-
-	private static ClassPathXmlApplicationContext context = null;
-
 	static Class<? extends Bill> clazz = null;
+	private static ClassPathXmlApplicationContext context = null;
 
 	static {
 		path = Joiner.on(File.separator).join(ROOT_DIR, payType.path());
@@ -58,8 +54,8 @@ public class RepayFinancialAPP {
 				clazz = UMPayBill.class;
 				break;
 		}
-		if(!payType.getChannelName().equals("易宝")) {	//易宝的不删了,易宝是手工准备的数据啊
-			// 拉取帐单前先清理目录
+		// 拉取帐单前先清理目录
+		if (!"易宝".equals(payType.getChannelName())) {
 			if (Paths.get(path).toFile().exists()) {
 				try {
 					FileUtils.cleanDirectory(Paths.get(path).toFile());
@@ -77,7 +73,7 @@ public class RepayFinancialAPP {
 			long begin = System.currentTimeMillis();
 			RepayHandler handler = getSpringContext().getBean(RepayHandler.class);
 			//按照参数，对账
-			handler.repayBillDetailHandler(Joiner.on(File.separator).join(ROOT_DIR, payType.path()), clazz, payType.getChannelAccount(), currentMonth);
+			handler.repayBillDetailHandler(path, clazz, payType.getChannelAccount(), currentMonth);
 			FinancialRepayDetailService repayDetailService = getSpringContext().getBean(FinancialRepayDetailService.class);
 			if (Constants.result.size() != 0) {
 				repayDetailService.saveDetails(Constants.result);
@@ -98,6 +94,4 @@ public class RepayFinancialAPP {
 		}
 		return context;
 	}
-
-
 }

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

 package cn.gq.financial.db.xyqb.dao;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -27,9 +26,12 @@ public interface ExportExcelMapper {
 
 	public List<LoanExpEntity> exportYeepay(@Param("list")List<Long> loanIds);
 	
-	public List<BaitiaoExpEntity> baitiaoRepayExport(@Param("list")List<String> list);
+	public List<BaitiaoExpEntity> baitiaoRepayExport(@Param("list")List<Long> list);
 
 	public List<BaitiaoExpEntity> baitiaoRepayExport1(@Param("list")List<Long> ids);
 
 	public List<ExportExcelEntity> getInfoByOrderIds1(@Param("list")List<Long> repaymentPlanIds);
+
+    List<BaitiaoExpEntity> baitiaoBillRepayExport(@Param("payCenterNos")List<String> list);
+
 }

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

@@ -12,6 +12,7 @@ public interface DetailService {
 	static String BIZ_TYPE_XYQB = "现金贷";
 	static String BIZ_TYPE_BAITIAO = "线上白条";
 	static String BIZ_TYPE_OFFLINE = "线下白条";
-	
+	String BIZ_TYPE_BILL_BAITIAO = "帐单白条";
+
 	public List<RepayDetailFinancial> getDetailByPayCenterRepayOrder(List<RepayOrderEntity> list);
 }

src/main/resources/applicationContext.properties

@@ -11,6 +11,11 @@ xyqb.jdbc.username=xyqb_query
 xyqb.jdbc.password=Uiwb@o^fR&nHOa5t
 
 
+#local
+local.jdbc.url=jdbc:mysql://127.0.0.1:3306/financial?useUnicode=true&characterEncoding=UTF8
+local.jdbc.username=root
+local.jdbc.password=root
+
 #mall
 mall.jdbc.url=jdbc:mysql://172.16.1.7:3306/mall?useUnicode=true&characterEncoding=UTF8
 mall.jdbc.username=xyqb_query
@@ -22,9 +27,9 @@ financial.jdbc.username=xyqb_query
 financial.jdbc.password=Uiwb@o^fR&nHOa5t
 
 #lkbadmin
-#lkbadmin.jdbc.url=jdbc:mysql://10.0.44.12:3306/lkbadmin?useUnicode=true&characterEncoding=utf8
-#lkbadmin.jdbc.username=lkbadmin_w
-#lkbadmin.jdbc.password=wj0msj8J8/v2Ee6Xl75ZDizrJBdEDOAQGlxTGKbRFng=
+lkbadmin.jdbc.url=jdbc:mysql://10.0.44.12:3306/lkbadmin?useUnicode=true&characterEncoding=utf8
+lkbadmin.jdbc.username=lkbadmin_w
+lkbadmin.jdbc.password=wj0msj8J8/v2Ee6Xl75ZDizrJBdEDOAQGlxTGKbRFng=
 
 #localDB
 local.repayment.jdbc.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8