交费历史导入

java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java

@@ -56,6 +56,17 @@ public class ImportRoomFee {
 
     private String feeTypeCd;
 
+    private String receivableAmount;
+
+    private String staffName;
+
+    public String getReceivableAmount() {
+        return receivableAmount;
+    }
+
+    public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
 
     public String getFloorNum() {
         return floorNum;
@@ -273,6 +284,14 @@ public class ImportRoomFee {
         return payerObjName;
     }
 
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public void setPayerObjName(String payerObjName) {
         this.payerObjName = payerObjName;
     }

service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java

@@ -113,7 +113,9 @@ public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDat
             Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
             Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
             Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
-            Assert.hasValue(os[6], (osIndex + 1) + "行缴费金额不能为空");
+            Assert.hasValue(os[6], (osIndex + 1) + "行应缴金额不能为空");
+            Assert.hasValue(os[7], (osIndex + 1) + "行实缴金额不能为空");
+            Assert.hasValue(os[8], (osIndex + 1) + "行收银员不能为空");
 
 //
 
@@ -132,7 +134,9 @@ public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDat
             importRoomFee.setStartTime(startTime);
             importRoomFee.setEndTime(endTime);
             importRoomFee.setCreateTime(createTime);
-            importRoomFee.setAmount(os[6].toString());
+            importRoomFee.setReceivableAmount(os[6].toString());
+            importRoomFee.setAmount(os[7].toString());
+            importRoomFee.setStaffName(os[8].toString());
             importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
             rooms.add(importRoomFee);
         }

service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java

@@ -112,36 +112,38 @@ public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDa
             if (StringUtil.isNullOrNone(os[4])) {
                 continue;
             }
-            Assert.hasValue(os[0], (osIndex + 1) + "行楼栋编号不能为空");
-            Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
-            Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
-            Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
-            Assert.hasValue(os[4], (osIndex + 1) + "行缴费周期不能为空");
-            Assert.hasValue(os[5], (osIndex + 1) + "行开始时间不能为空");
-            Assert.hasValue(os[6], (osIndex + 1) + "行结束时间不能为空");
-            Assert.hasValue(os[7], (osIndex + 1) + "行缴费时间不能为空");
-            Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");
+            Assert.hasValue(os[0], (osIndex + 1) + "行房屋编号不能为空");
+            Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空");
+            Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空");
+            Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
+            Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
+            Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
+            Assert.hasValue(os[6], (osIndex + 1) + "行应缴金额不能为空");
+            Assert.hasValue(os[7], (osIndex + 1) + "行实缴金额不能为空");
+            Assert.hasValue(os[8], (osIndex + 1) + "行收银员不能为空");
 
 //
 
-            String startTime = excelDoubleToDate(os[5].toString());
-            String endTime = excelDoubleToDate(os[6].toString());
-            String createTime = excelDoubleToDate(os[7].toString());
+            String startTime = excelDoubleToDate(os[3].toString());
+            String endTime = excelDoubleToDate(os[4].toString());
+            String createTime = excelDoubleToDate(os[5].toString());
             Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
             Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
             Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
 
-
+            String[] roomNames = os[0].toString().split("-",3);
             importRoomFee = new ImportRoomFee();
-            importRoomFee.setFloorNum(os[0].toString());
-            importRoomFee.setUnitNum(os[1].toString());
-            importRoomFee.setRoomNum(os[2].toString());
-            importRoomFee.setFeeName(os[3].toString());
-            importRoomFee.setCycle(os[4].toString());
+            importRoomFee.setFloorNum(roomNames[0]);
+            importRoomFee.setUnitNum(roomNames[1]);
+            importRoomFee.setRoomNum(roomNames[2]);
+            importRoomFee.setFeeName(os[1].toString());
+            importRoomFee.setCycle(os[2].toString());
             importRoomFee.setStartTime(startTime);
             importRoomFee.setEndTime(endTime);
             importRoomFee.setCreateTime(createTime);
-            importRoomFee.setAmount(os[8].toString());
+            importRoomFee.setReceivableAmount(os[6].toString());
+            importRoomFee.setAmount(os[7].toString());
+            importRoomFee.setStaffName(os[8].toString());
             importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
             rooms.add(importRoomFee);
         }

service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java

@@ -185,7 +185,7 @@ public class ImportCarHistoryFeeDetailQueueDataAdapt extends DefaultImportData i
         PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
         payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
         payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount());
-        payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount());
+        payFeeDetailPo.setReceivableAmount(importRoomFee.getReceivableAmount());
         payFeeDetailPo.setCycles(importRoomFee.getCycle());
         payFeeDetailPo.setPrimeRate("1.0");
         payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
@@ -204,6 +204,7 @@ public class ImportCarHistoryFeeDetailQueueDataAdapt extends DefaultImportData i
         payFeeDetailPo.setRemark(importRoomFee.getRemark());
         payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
         payFeeDetailPo.setState("1400");
+        payFeeDetailPo.setCashierName(importRoomFee.getStaffName());
         payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
         int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
 

service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomHistoryFeeDetailQueueDataAdapt.java

@@ -198,7 +198,7 @@ public class ImportRoomHistoryFeeDetailQueueDataAdapt extends DefaultImportData
         PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
         payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
         payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount());
-        payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount());
+        payFeeDetailPo.setReceivableAmount(importRoomFee.getReceivableAmount());
         payFeeDetailPo.setCycles(importRoomFee.getCycle());
         payFeeDetailPo.setPrimeRate("1.0");
         payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
@@ -217,6 +217,7 @@ public class ImportRoomHistoryFeeDetailQueueDataAdapt extends DefaultImportData
         payFeeDetailPo.setRemark(importRoomFee.getRemark());
         payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
         payFeeDetailPo.setState("1400");
+        payFeeDetailPo.setCashierName(importRoomFee.getStaffName());
         payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
         int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
 

springboot/src/main/java/com/java110/boot/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java

@@ -86,7 +86,6 @@ public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDat
             importRoomFee.setStoreId(paramIn.getString("storeId"));
             importRoomFee.setObjType(paramIn.getString("objType"));
             importRoomFee.setCommunityId(paramIn.getString("communityId"));
-
         }
         return rooms;
     }
@@ -115,7 +114,9 @@ public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDat
             Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
             Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
             Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
-            Assert.hasValue(os[6], (osIndex + 1) + "行缴费金额不能为空");
+            Assert.hasValue(os[6], (osIndex + 1) + "行应缴金额不能为空");
+            Assert.hasValue(os[7], (osIndex + 1) + "行实缴金额不能为空");
+            Assert.hasValue(os[8], (osIndex + 1) + "行收银员不能为空");
 
 //
 
@@ -134,10 +135,19 @@ public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDat
             importRoomFee.setStartTime(startTime);
             importRoomFee.setEndTime(endTime);
             importRoomFee.setCreateTime(createTime);
-            importRoomFee.setAmount(os[6].toString());
+            importRoomFee.setReceivableAmount(os[6].toString());
+            importRoomFee.setAmount(os[7].toString());
+            importRoomFee.setStaffName(os[8].toString());
             importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
             rooms.add(importRoomFee);
         }
     }
 
+    /**
+     * 生成批次号
+     *
+     * @param reqJson
+     */
+
+
 }

springboot/src/main/java/com/java110/boot/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java

@@ -84,6 +84,7 @@ public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDa
             importRoomFee.setStoreId(paramIn.getString("storeId"));
             importRoomFee.setObjType(paramIn.getString("objType"));
             importRoomFee.setCommunityId(paramIn.getString("communityId"));
+
         }
         return rooms;
     }
@@ -112,40 +113,41 @@ public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDa
             if (StringUtil.isNullOrNone(os[4])) {
                 continue;
             }
-            Assert.hasValue(os[0], (osIndex + 1) + "行楼栋编号不能为空");
-            Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
-            Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
-            Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
-            Assert.hasValue(os[4], (osIndex + 1) + "行缴费周期不能为空");
-            Assert.hasValue(os[5], (osIndex + 1) + "行开始时间不能为空");
-            Assert.hasValue(os[6], (osIndex + 1) + "行结束时间不能为空");
-            Assert.hasValue(os[7], (osIndex + 1) + "行缴费时间不能为空");
-            Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");
+            Assert.hasValue(os[0], (osIndex + 1) + "行房屋编号不能为空");
+            Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空");
+            Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空");
+            Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
+            Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
+            Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
+            Assert.hasValue(os[6], (osIndex + 1) + "行应缴金额不能为空");
+            Assert.hasValue(os[7], (osIndex + 1) + "行实缴金额不能为空");
+            Assert.hasValue(os[8], (osIndex + 1) + "行收银员不能为空");
 
 //
 
-            String startTime = excelDoubleToDate(os[5].toString());
-            String endTime = excelDoubleToDate(os[6].toString());
-            String createTime = excelDoubleToDate(os[7].toString());
+            String startTime = excelDoubleToDate(os[3].toString());
+            String endTime = excelDoubleToDate(os[4].toString());
+            String createTime = excelDoubleToDate(os[5].toString());
             Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
             Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
             Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
 
-
+            String[] roomNames = os[0].toString().split("-",3);
             importRoomFee = new ImportRoomFee();
-            importRoomFee.setFloorNum(os[0].toString());
-            importRoomFee.setUnitNum(os[1].toString());
-            importRoomFee.setRoomNum(os[2].toString());
-            importRoomFee.setFeeName(os[3].toString());
-            importRoomFee.setCycle(os[4].toString());
+            importRoomFee.setFloorNum(roomNames[0]);
+            importRoomFee.setUnitNum(roomNames[1]);
+            importRoomFee.setRoomNum(roomNames[2]);
+            importRoomFee.setFeeName(os[1].toString());
+            importRoomFee.setCycle(os[2].toString());
             importRoomFee.setStartTime(startTime);
             importRoomFee.setEndTime(endTime);
             importRoomFee.setCreateTime(createTime);
-            importRoomFee.setAmount(os[8].toString());
+            importRoomFee.setReceivableAmount(os[6].toString());
+            importRoomFee.setAmount(os[7].toString());
+            importRoomFee.setStaffName(os[8].toString());
             importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
             rooms.add(importRoomFee);
         }
     }
 
-
 }