代码重构

src/main/java/ieven/server/webapp/service/tenpay/TenpayOrders.java

@@ -105,27 +105,28 @@ public class TenpayOrders extends Ops implements Runnable {
           newDoc.put("交易单号", originDoc.getString("交易单号"));
           String f1 = originDoc.getString("借贷类型");
           newDoc.put("借贷类型", originDoc.getString("借贷类型"));
-          newDoc.put("交易类型", originDoc.getString("交易业务类型"));
+          newDoc.put("交易类型", originDoc.getString("交易用途类型"));
           newDoc.put("交易金额(分)", originDoc.getString("交易金额(分)"));
           newDoc.put("账户余额(分)", originDoc.getString("账户余额(分)"));
           newDoc.put("交易时间", originDoc.getString("交易时间"));
           newDoc.put("银行类型", originDoc.getString("交易用途类型"));
-          newDoc.put("交易说明", newFileId);
-          newDoc.put("商户名称", newFileId);
+          newDoc.put("交易说明", originDoc.getString("备注1") + originDoc.getString("备注2"));
           if (f1.equals("出")) {
             newDoc.put("发送金额(分)", originDoc.getString("交易金额(分)"));
             newDoc.put("银行卡号", originDoc.getString("用户银行卡号"));
             newDoc.put("发送方", originDoc.getString("用户ID"));
             newDoc.put("接收方", originDoc.getString("对手方ID"));
+            newDoc.put("接收方银行卡号", originDoc.getString("对手方银行卡号"));
           }
           if (f1.equals("入")) {
             newDoc.put("接收金额(分)", originDoc.getString("交易金额(分)"));
             newDoc.put("银行卡号", originDoc.getString("对手方银行卡号"));
             newDoc.put("发送方", originDoc.getString("对手方ID"));
             newDoc.put("接收方", originDoc.getString("用户ID"));
+            newDoc.put("接收方银行卡号", originDoc.getString("用户银行卡号"));
           }
-          newDoc.put("网银联单号1", originDoc.getString("备注1"));
-          newDoc.put("网银联单号2", originDoc.getString("备注2"));
+          newDoc.put("网银联单号1", originDoc.getString("用户侧网银联单号"));
+          newDoc.put("网银联单号2", originDoc.getString("对手侧网银联单号"));
           needToSave.add(newDoc);
           if (needToSave.size() >= 1000) {
             saveLines(new ArrayList<>(needToSave), mongoTemplate);

src/main/java/ieven/server/webapp/service/tenpay/TenpayTrades.java

@@ -73,11 +73,11 @@ public class TenpayTrades extends Ops implements Runnable {
           if (StringUtils.isBlank(origin.getString("发送方"))) {
             dataMap.put("交易主体账号", userId);
           }
-          dataMap.put("交易主体银行卡号", "");
+          dataMap.put("交易主体银行卡号", origin.getString("银行卡号"));
           dataMap.put("交易主体银行名称", "");
           dataMap.put("交易主体户名", accountToName.getOrDefault(origin.getString("发送方"), ""));
           dataMap.put("交易对手账号", origin.getString("接收方"));
-          dataMap.put("交易对手银行卡号", origin.getString("银行卡号"));
+          dataMap.put("交易对手银行卡号", origin.getString("接收方银行卡号"));
           dataMap.put("交易对手银行名称", "");
           dataMap.put(
               "交易对手户名",
@@ -88,14 +88,14 @@ public class TenpayTrades extends Ops implements Runnable {
           if (StringUtils.isBlank(origin.getString("接收方"))) {
             dataMap.put("交易主体账号", userId);
           }
-          dataMap.put("交易主体银行卡号", "");
+          dataMap.put("交易主体银行卡号", origin.getString("接收方银行卡号"));
           dataMap.put("交易主体银行名称", "");
           dataMap.put(
               "交易主体户名",
               accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("接收方")), ""));
 
           dataMap.put("交易对手账号", StringUtils.trimToEmpty(origin.getString("发送方")));
-          dataMap.put("交易对手银行卡号", "");
+          dataMap.put("交易对手银行卡号", origin.getString("银行卡号"));
           dataMap.put("交易对手银行名称", "");
           dataMap.put(
               "交易对手户名",