diff --git a/Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java b/Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java
index 1434bdca11..06aa84e2cf 100644
--- a/Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java
+++ b/Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java
@@ -202,6 +202,10 @@ public void freshOrderProtocol(JSONObject orders, Map<String, String> headers) {
             if(CommonConstant.ORDER_PROCESS.equals(key)){
                 orders.put("orderProcess", headers.get(CommonConstant.ORDER_PROCESS));
             }
+
+            if(CommonConstant.O_ID.equals(key)){
+                orders.put("oId", headers.get(CommonConstant.O_ID));
+            }
         }
 
     }
diff --git a/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
index 832f2127fe..99b7e5f8c4 100644
--- a/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
@@ -270,6 +270,9 @@ public JSONObject addFeeConfigProperty(JSONObject paramInJson, DataFlowContext d
         businessFeeConfig.put("additionalAmount", "0.00");
         businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
         businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "004");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
         businessFeeConfig.put("isDefault", "T");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
@@ -301,6 +304,9 @@ public JSONObject addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlo
         businessFeeConfig.put("additionalAmount", "0.00");
         businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
         businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "004");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
         businessFeeConfig.put("isDefault", "T");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
@@ -332,6 +338,9 @@ public JSONObject addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataF
         businessFeeConfig.put("additionalAmount", "0.00");
         businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
         businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "004");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
         businessFeeConfig.put("isDefault", "T");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
@@ -363,6 +372,9 @@ public JSONObject addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlo
         businessFeeConfig.put("additionalAmount", "0.00");
         businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
         businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "004");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
         businessFeeConfig.put("isDefault", "T");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
@@ -394,6 +406,9 @@ public JSONObject addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataF
         businessFeeConfig.put("additionalAmount", "0.00");
         businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
         businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "004");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
         businessFeeConfig.put("isDefault", "T");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
@@ -425,6 +440,9 @@ public JSONObject addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowC
         businessFeeConfig.put("additionalAmount", "0.00");
         businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
         businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "004");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
         businessFeeConfig.put("isDefault", "T");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
diff --git a/Api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java b/Api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
index ab14b76ca1..4d95ab08b9 100644
--- a/Api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
+++ b/Api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
@@ -63,7 +63,7 @@ public void soService(ServiceDataFlowEvent event) {
         HttpHeaders header = new HttpHeaders();
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
-        dataFlowContext.getRequestCurrentHeaders().put("oId", paramObj.getString("oId"));
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.O_ID, paramObj.getString("oId"));
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS,Orders.ORDER_PROCESS_ORDER_CONFIRM_SUBMIT);
         ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
 
diff --git a/Api/src/main/java/com/java110/api/listener/unit/UpdateUnitListener.java b/Api/src/main/java/com/java110/api/listener/unit/UpdateUnitListener.java
index c416d2b632..017908032a 100644
--- a/Api/src/main/java/com/java110/api/listener/unit/UpdateUnitListener.java
+++ b/Api/src/main/java/com/java110/api/listener/unit/UpdateUnitListener.java
@@ -72,7 +72,7 @@ public void soService(ServiceDataFlowEvent event) {
         JSONArray businesses = new JSONArray();
 
         //添加单元信息
-        businesses.add(unitBMOImpl.editUnit(paramObj, dataFlowContext));
+        businesses.add(unitBMOImpl.editUpdateUnit(paramObj, dataFlowContext));
 
 
 
diff --git a/FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java b/FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java
index ca26117091..325f15ccc1 100644
--- a/FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java
+++ b/FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java
@@ -49,6 +49,9 @@ protected void flushBusinessFeeConfigInfo(Map businessFeeConfigInfo, String stat
         businessFeeConfigInfo.put("startTime", businessFeeConfigInfo.get("start_time"));
         businessFeeConfigInfo.put("endTime", businessFeeConfigInfo.get("end_time"));
         businessFeeConfigInfo.put("communityId", businessFeeConfigInfo.get("community_id"));
+        businessFeeConfigInfo.put("paymentCd", businessFeeConfigInfo.get("payment_cd"));
+        businessFeeConfigInfo.put("paymentCycle", businessFeeConfigInfo.get("payment_cycle"));
+        businessFeeConfigInfo.put("billType", businessFeeConfigInfo.get("bill_type"));
         businessFeeConfigInfo.remove("bId");
         businessFeeConfigInfo.put("statusCd", statusCd);
     }
@@ -85,6 +88,9 @@ protected void autoSaveDelBusinessFeeConfig(Business business, JSONObject busine
         currentFeeConfigInfo.put("startTime", currentFeeConfigInfo.get("start_time"));
         currentFeeConfigInfo.put("endTime", currentFeeConfigInfo.get("end_time"));
         currentFeeConfigInfo.put("communityId", currentFeeConfigInfo.get("community_id"));
+        currentFeeConfigInfo.put("paymentCd", currentFeeConfigInfo.get("payment_cd"));
+        currentFeeConfigInfo.put("paymentCycle", currentFeeConfigInfo.get("payment_cycle"));
+        currentFeeConfigInfo.put("billType", currentFeeConfigInfo.get("bill_type"));
 
 
         currentFeeConfigInfo.put("operate", StatusConstant.OPERATE_DEL);
diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
index 788842738e..35dbfc1430 100644
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
@@ -29,6 +29,14 @@ public class FeeConfigDto extends PageDto implements Serializable {
     private String feeTypeCdName;
     private String feeFlagName;
 
+    private String billType;
+
+    private String billTypeName;
+
+    private String paymentCd;
+
+    private String paymentCycle;
+
 
     private Date createTime;
 
@@ -155,4 +163,37 @@ public String getFeeFlagName() {
     public void setFeeFlagName(String feeFlagName) {
         this.feeFlagName = feeFlagName;
     }
-}
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillTypeName() {
+        return billTypeName;
+    }
+
+    public void setBillTypeName(String billTypeName) {
+        this.billTypeName = billTypeName;
+    }
+
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
+}
\ No newline at end of file
diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
index 88c70eafda..699077a217 100644
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -45,6 +45,10 @@ public class FeeDto extends PageDto implements Serializable {
     private String computingFormula;
     private String isDefault;
 
+    private String paymentCd;
+
+    private String paymentCycle;
+
 
     private Date createTime;
 
@@ -53,12 +57,11 @@ public class FeeDto extends PageDto implements Serializable {
     /**
      * 费用项开始时间
      */
-    private  Date configStartTime;
+    private Date configStartTime;
     /**
      * 费用项结束时间
      */
-    private Date  configEndTime;
-
+    private Date configEndTime;
 
 
     public String getAmount() {
@@ -302,4 +305,20 @@ public Date getConfigEndTime() {
     public void setConfigEndTime(Date configEndTime) {
         this.configEndTime = configEndTime;
     }
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
 }
diff --git a/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java
index da0d3fa4fd..ed90346678 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java
@@ -33,6 +33,9 @@ public class ApiFeeDataVo implements Serializable {
     private String feePrice;
     private String isDefault;
 
+    private String paymentCd;
+
+    private String paymentCycle;
     public String getAmount() {
         return amount;
     }
@@ -176,4 +179,20 @@ public String getIsDefault() {
     public void setIsDefault(String isDefault) {
         this.isDefault = isDefault;
     }
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
 }
diff --git a/java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java
index 1d32ef4990..f67bb81464 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java
@@ -1,7 +1,6 @@
 package com.java110.vo.api.feeConfig;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class ApiFeeConfigDataVo implements Serializable {
 
@@ -18,6 +17,15 @@ public class ApiFeeConfigDataVo implements Serializable {
     private String feeFlagName;
     private String isDefault;
 
+    private String billType;
+
+    private String billTypeName;
+
+    private String paymentCd;
+
+    private String paymentCycle;
+
+
     public String getConfigId() {
         return configId;
     }
@@ -113,4 +121,36 @@ public String getIsDefault() {
     public void setIsDefault(String isDefault) {
         this.isDefault = isDefault;
     }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillTypeName() {
+        return billTypeName;
+    }
+
+    public void setBillTypeName(String billTypeName) {
+        this.billTypeName = billTypeName;
+    }
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
 }
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
index 7dbc58def4..aa4a36a680 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -7,9 +7,11 @@
     <!-- 保存费用配置信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessFeeConfigInfo" parameterType="Map">
         insert into business_pay_fee_config(
-        fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
+        fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,
+        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
         ) values (
-        #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},#{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId}
+        #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},
+        #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle}
         )
     </insert>
 
@@ -20,7 +22,8 @@
         computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.square_price,t.square_price
         squarePrice,t.is_default,t.is_default isDefault,t.operate,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
         feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time startTime,t.end_time,t.end_time
-        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType,
+        t.payment_cd,t.payment_cycle
         from business_pay_fee_config t
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -29,10 +32,10 @@
         <if test="computingFormula !=null and computingFormula != ''">
             and t.computing_formula= #{computingFormula}
         </if>
-        <if test="additionalAmount !=null and additionalAmount != ''">
+        <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
             and t.additional_amount= #{additionalAmount}
         </if>
-        <if test="squarePrice !=null and squarePrice != ''">
+        <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
             and t.square_price= #{squarePrice}
         </if>
         <if test="isDefault !=null and isDefault != ''">
@@ -50,6 +53,9 @@
         <if test="feeName !=null and feeName != ''">
             and t.fee_name= #{feeName}
         </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
         <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
@@ -69,9 +75,12 @@
     <!-- 保存费用配置信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveFeeConfigInfoInstance" parameterType="Map">
         insert into pay_fee_config(
-        fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
+        fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
+        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
         ) select
-        t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,t.start_time,t.end_time,t.community_id,t.b_id
+        t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,
+        t.start_time,t.end_time,t.community_id,
+        t.b_id,t.bill_type,t.payment_cd,t.payment_cycle
         from business_pay_fee_config t where 1=1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
@@ -98,6 +107,9 @@
         <if test="feeName !=null and feeName != ''">
             and t.fee_name= #{feeName}
         </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
         <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
@@ -121,8 +133,9 @@
         statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
         configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
-        td1.name feeTypeCdName,td2.name feeFlagName
-        from pay_fee_config t,t_dict td1,t_dict td2
+        td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
+        t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle
+        from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
         where 1 =1
         and t.fee_type_cd = td1.status_cd
         and td1.table_name = 'pay_fee_config'
@@ -130,6 +143,9 @@
         and t.fee_flag = td2.status_cd
         and td2.table_name = 'pay_fee_config'
         and td2.table_columns = 'fee_flag'
+        and t.bill_type = td3.status_cd
+        and td3.table_name = 'pay_fee_config'
+        and td3.table_columns = 'bill_type'
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
         </if>
@@ -169,6 +185,12 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+        <if test="paymentCd !=null and paymentCd != ''">
+            and t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            and t.payment_cycle= #{paymentCycle}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -195,6 +217,12 @@
         <if test="squarePrice !=null and squarePrice != ''">
             , t.square_price= #{squarePrice}
         </if>
+        <if test="paymentCd !=null and paymentCd != ''">
+            , t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            , t.payment_cycle= #{paymentCycle}
+        </if>
         <if test="isDefault !=null and isDefault != ''">
             , t.is_default= #{isDefault}
         </if>
@@ -204,6 +232,9 @@
         <if test="feeName !=null and feeName != ''">
             , t.fee_name= #{feeName}
         </if>
+        <if test="billType !=null and billType != ''">
+            , t.bill_type= #{billType}
+        </if>
         <if test="startTime !=null ">
             , t.start_time= #{startTime}
         </if>
@@ -226,7 +257,7 @@
     <!-- 查询费用配置数量 add by wuxw 2018-07-03 -->
     <select id="queryFeeConfigsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from pay_fee_config t,t_dict td1,t_dict td2
+        from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
         where 1 =1
         and t.fee_type_cd = td1.status_cd
         and td1.table_name = 'pay_fee_config'
@@ -234,6 +265,9 @@
         and t.fee_flag = td2.status_cd
         and td2.table_name = 'pay_fee_config'
         and td2.table_columns = 'fee_flag'
+        and t.bill_type = td3.status_cd
+        and td3.table_name = 'pay_fee_config'
+        and td3.table_columns = 'bill_type'
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
         </if>
@@ -273,8 +307,14 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+        <if test="paymentCd !=null and paymentCd != ''">
+            and t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            and t.payment_cycle= #{paymentCycle}
+        </if>
 
 
     </select>
 
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
index fd0d7ad39f..70dfd619ef 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
@@ -20,7 +20,8 @@
         select t.amount,t.operate,t.income_obj_id,t.income_obj_id incomeObjId,t.fee_type_cd,t.fee_type_cd
         feeTypeCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id userId,t.payer_obj_id,t.payer_obj_id
-        payerObjId,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,t.payer_obj_type,t.payer_obj_type payerObjType
+        payerObjId,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id
+        configId,t.payer_obj_type,t.payer_obj_type payerObjType
         from business_pay_fee t
         where 1 =1
         <if test="amount !=null and amount != ''">
@@ -135,8 +136,10 @@
         endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id
         userId,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.square_price squarePrice,pfc.additional_amount
         additionalAmount,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
-        pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula computingFormula,
-        t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time configStartTime,pfc.end_time configEndTime
+        pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula
+        computingFormula,
+        t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time
+        configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle
         from pay_fee t,pay_fee_config pfc,t_dict td1,t_dict td2,t_dict td3
         where 1 =1
         and t.fee_type_cd = pfc.fee_type_cd
@@ -311,7 +314,7 @@
             and t.end_time &lt; #{arrearsEndTime}
         </if>
         <if test="noArrearsEndTime != null">
-            and t.end_time &gt;  #{noArrearsEndTime}
+            and t.end_time &gt; #{noArrearsEndTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -348,7 +351,199 @@
             and t.payer_obj_type = #{payerObjType}
         </if>
 
+    </select>
+
+
+    <!-- 查询账期 -->
+    <select id="queryBills" parameterType="Map" resultType="Map">
+        select
+        t.bill_id billId,
+        t.bill_name billName,
+        t.receivable,
+        t.receipts,
+        t.bill_time billTime,
+        t.community_id communityId,
+        t.config_id configId,
+        t.cur_bill curBill
+        from bill t
+        where 1 =1
+        <if test="billId !=null and billId != ''">
+            and t.bill_id= #{billId}
+        </if>
+        <if test="billName !=null and billName != ''">
+            and t.bill_name= #{billName}
+        </if>
+        <if test="receivable !=null and receivable != ''">
+            and t.receivable= #{receivable}
+        </if>
+        <if test="receipts !=null">
+            and t.receipts= #{receipts}
+        </if>
+        <if test="billTime !=null">
+            and t.bill_time= #{billTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="configId != null and configId != ''">
+            and t.config_id = #{configId}
+        </if>
+        <if test="curBill != null and curBill != ''">
+            and t.cur_bill = #{curBill}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
+
+    <!-- 查询账期 -->
+    <select id="queryBillCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from bill t
+        where 1 =1
+        <if test="billId !=null and billId != ''">
+            and t.bill_id= #{billId}
+        </if>
+        <if test="billName !=null and billName != ''">
+            and t.bill_name= #{billName}
+        </if>
+        <if test="receivable !=null and receivable != ''">
+            and t.receivable= #{receivable}
+        </if>
+        <if test="curReceivable !=null and curReceivable != ''">
+            and t.cur_receivable= #{curReceivable}
+        </if>
+        <if test="receipts !=null">
+            and t.receipts= #{receipts}
+        </if>
+        <if test="billTime !=null">
+            and t.bill_time= #{billTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="configId != null and configId != ''">
+            and t.config_id = #{configId}
+        </if>
+        <if test="curBill != null and curBill != ''">
+            and t.cur_bill = #{curBill}
+        </if>
+    </select>
+
+
+    <!-- 查询账期 -->
+    <select id="queryBillOweFees" parameterType="Map" resultType="Map">
+        select
+        t.owe_id oweId,
+        t.bill_id billId,
+        t.fee_id feeId,
+        t.bill_amount_owed billAmountOwed,
+        t.amount_owed amountOwed,
+        t.fee_end_time feeEndTime,
+        t.owner_id ownerId,
+        t.owner_name ownerName,
+        t.owner_tel ownerTel,
+        t.payer_obj_name payerObjName,
+        t.payer_obj_type payerObjType,
+        t.community_id communityId,
+        t.state,
+        t.create_time createTime
+        from bill_owe_fee t
+        where 1 =1
+        <if test="oweId !=null and oweId != ''">
+            and t.owe_id= #{oweId}
+        </if>
+        <if test="billId !=null and billId != ''">
+            and t.bill_id= #{billId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="billAmountOwed !=null and billAmountOwed != ''">
+            and t.bill_amount_owed= #{billAmountOwed}
+        </if>
+        <if test="amountOwed !=null and amountOwed != ''">
+            and t.amount_owed= #{amountOwed}
+        </if>
+        <if test="feeEndTime != null">
+            and t.fee_end_time = #{feeEndTime}
+        </if>
+        <if test="ownerId != null and ownerId != ''">
+            and t.owner_id = #{ownerId}
+        </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name = #{ownerName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
 
+    <!-- 查询账期 -->
+    <select id="queryBillOweFeeCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from bill_owe_fee t
+        where 1 =1
+        <if test="oweId !=null and oweId != ''">
+            and t.owe_id= #{oweId}
+        </if>
+        <if test="billId !=null and billId != ''">
+            and t.bill_id= #{billId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="billAmountOwed !=null and billAmountOwed != ''">
+            and t.bill_amount_owed= #{billAmountOwed}
+        </if>
+        <if test="amountOwed !=null and amountOwed != ''">
+            and t.amount_owed= #{amountOwed}
+        </if>
+        <if test="feeEndTime != null">
+            and t.fee_end_time = #{feeEndTime}
+        </if>
+        <if test="ownerId != null and ownerId != ''">
+            and t.owner_id = #{ownerId}
+        </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name = #{ownerName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
     </select>
 
-</mapper>
+
+    <insert id="insertBillOweFees" parameterType="Map">
+        INSERT INTO bill_owe_fee
+        (`owe_id`, `bill_id`, `fee_id`, `bill_amount_owed`, `amount_owed`, `fee_end_time`, `owner_id`, `owner_name`,
+        `owner_tel`, `payer_obj_name`, `payer_obj_type`, `community_id`, `state`)
+        VALUES (#{oweId}, #{billId}, #{feeId}, #{billAmountOwed}, #{amountOwed}, #{feeEndTime}, #{ownerId},
+        #{ownerName},
+        #{ownerTel}, #{payerObjName}, #{payerObjType}, #{communityId}, #{state})
+    </insert>
+
+    <insert id="insertBill" parameterType="Map">
+        INSERT INTO bill (`bill_id`, `bill_name`, `receivable`, `receipts`, `bill_time`, `community_id`, `config_id`,
+        `remark`, `cur_bill`, `cur_receivable`)
+        VALUES (#{billId}, #{billName}, #{receivable}, #{receipts}, #{billTime}, #{communityId}, #{configId},
+        #{remark}, #{curBill}, #{curReceivable})
+    </insert>
+
+    <update id="updateBill" parameterType="Map">
+        update bill set cur_bill= 'F' where config_id = #{configId}
+    </update>
+
+
+</mapper>
\ No newline at end of file
diff --git a/java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java b/java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java
index 3b76c6f537..8cf0bd8c69 100644
--- a/java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java
+++ b/java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java
@@ -148,7 +148,7 @@ public class CommonConstant {
     public final static String HTTP_ORDER_TYPE_CD = "order_type_cd";
     public final static String HTTP_USER_ID = "user_id";
     public final static String ORDER_PROCESS = "order_process";
-
+    public final static String O_ID = "o_id";
 
     public final static String HTTP_METHOD_POST = "POST";
     public final static String HTTP_METHOD_PUT = "PUT";