tom.xu@informa.com %!s(int64=2) %!d(string=hai) anos
pai
achega
f13ca7adc8

+ 1 - 1
src/main/java/ieven/server/webapp/domain/file/FileService.java

@@ -105,7 +105,7 @@ public class FileService {
             mongoExcelService.insertRest();
           } else if (filename.endsWith(".csv")) {
             mongoExcelService = new MongoExcelService(this.mongoTemplate, uploaded.getId());
-            CSVParser csvParser = CSVFormat.EXCEL.parse(new InputStreamReader(inputStream, "gbk"));
+            CSVParser csvParser = CSVFormat.EXCEL.parse(new InputStreamReader(inputStream, "utf8"));
             int curRow = 0;
             int curRowWxFile = 0;
             boolean wxFile = false;

+ 2 - 2
src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -179,7 +179,7 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
       dataMap.put("交易地点经度", origin.getString("交易地点经度"));
       dataMap.put("交易地点纬度", origin.getString("交易地点纬度"));
       dataMap.put("备注", origin.getString("备注"));
-      if ("".equals(flag)) {
+      if ("出账".equals(flag)) {
         dataMap.put("交易主体账号", origin.getString("付款支付账号"));
         dataMap.put("交易主体银行卡号", origin.getString("付款银行卡号"));
         dataMap.put("交易主体银行名称", origin.getString("付款银行卡银行名称"));
@@ -189,7 +189,7 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
         dataMap.put("交易对手银行名称", origin.getString("收款银行卡银行名称"));
         dataMap.put("交易对手户名", origin.getString("收款方的商户名称"));
 
-      } else if ("".equals(flag)) {
+      } else if ("入账".equals(flag)) {
         dataMap.put("交易主体账号", origin.getString("收款支付账号"));
         dataMap.put("交易主体银行卡号", origin.getString("收款银行卡号"));
         dataMap.put("交易主体银行名称", origin.getString("收款银行卡银行名称"));

+ 0 - 1
src/main/java/ieven/server/webapp/service/tenpay/TenpayOrders.java

@@ -112,7 +112,6 @@ public class TenpayOrders extends Ops implements Runnable {
           newDoc.put("银行类型", originDoc.getString("交易用途类型"));
           newDoc.put("交易说明", newFileId);
           newDoc.put("商户名称", newFileId);
-
           if (f1.equals("出")) {
             newDoc.put("发送金额(分)", originDoc.getString("交易金额(分)"));
             newDoc.put("银行卡号", originDoc.getString("用户银行卡号"));