费用创建 处理完成

service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -551,7 +551,8 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
         businessUnit.put("amount", "-1.00");
         businessUnit.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        businessUnit.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        businessUnit.put("endTime", paramInJson.containsKey("feeEndDate") ? paramInJson.getString("feeEndDate")
+                : DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         businessUnit.put("communityId", paramInJson.getString("communityId"));
         businessUnit.put("payerObjId", roomDto.getRoomId());
         businessUnit.put("payerObjType", "3333");

service-community/src/main/java/com/java110/community/listener/room/SaveRoomInfoListener.java

@@ -2,6 +2,7 @@ package com.java110.community.listener.room;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.po.room.RoomAttrPo;
 import com.java110.po.room.RoomPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
@@ -157,7 +158,7 @@ public class SaveRoomInfoListener extends AbstractRoomBusinessServiceDataFlowLis
 
         if (businessRoom.getString("roomId").startsWith("-")) {
             //刷新缓存
-            flushRoomId(business.getDatas());
+            flushRoomId(business.getDatas(),businessRoom);
 
             //businessRoom.put("roomId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
 
@@ -175,14 +176,14 @@ public class SaveRoomInfoListener extends AbstractRoomBusinessServiceDataFlowLis
      *
      * @param data 数据
      */
-    private void flushRoomId(JSONObject data) {
+    private void flushRoomId(JSONObject data,JSONObject businessRoom) {
 
         String roomId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId);
-        JSONObject businessRoom = data.getJSONObject("businessRoom");
+        //JSONObject businessRoom = data.getJSONObject(RoomPo.class.getSimpleName());
         businessRoom.put("roomId", roomId);
         //刷小区属性
-        if (data.containsKey("businessRoomAttr")) {
-            JSONArray businessRoomAttrs = data.getJSONArray("businessRoomAttr");
+        if (data.containsKey(RoomAttrPo.class.getSimpleName())) {
+            JSONArray businessRoomAttrs = data.getJSONArray(RoomAttrPo.class.getSimpleName());
             for (int businessRoomAttrIndex = 0; businessRoomAttrIndex < businessRoomAttrs.size(); businessRoomAttrIndex++) {
                 JSONObject businessRoomAttr = businessRoomAttrs.getJSONObject(businessRoomAttrIndex);
                 businessRoomAttr.put("roomId", roomId);

service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -789,17 +789,17 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
             importFee.setFeeFlag("周期性费用".equals(os[3]) ? "1003006" : "2006012");
             importFee.setPaymentCd("预付费".equals(os[4]) ? "1200" : "2100");
             String billType = "";
-            if ("每年1月1日".equals(os[5])) {
+            if ("每年1月1日".equals(os[6])) {
                 billType = "001";
-            } else if ("每月1日".equals(os[5])) {
+            } else if ("每月1日".equals(os[6])) {
                 billType = "002";
-            } else if ("每日".equals(os[5])) {
+            } else if ("每日".equals(os[6])) {
                 billType = "003";
             } else {
                 billType = "004";
             }
             importFee.setBillType(billType);
-            importFee.setPaymentCycle(os[6].toString());
+            importFee.setPaymentCycle(os[5].toString());
             importFee.setStartTime(os[7].toString());
             importFee.setEndTime(os[8].toString());
             importFee.setComputingFormula(os[9].toString());