Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/community/CommunityV1ServiceDaoImplMapper.xml

@@ -79,6 +79,9 @@
         <if test="feePrice !=null and feePrice != ''">
             , t.fee_price= #{feePrice}
         </if>
+        <if test="feePrice == '0'">
+            , t.fee_price= #{feePrice}
+        </if>
         <if test="address !=null and address != ''">
             , t.address= #{address}
         </if>

java110-interface/src/main/java/com/java110/intf/feeAccountDetail/IFeeAccountDetailServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.intf.feeAccountDetail;
+package com.java110.intf.fee;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;

service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java

@@ -4,7 +4,7 @@ package com.java110.api.listener.fee;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
 import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
-import com.java110.intf.feeAccountDetail.IFeeAccountDetailServiceSMO;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java

@@ -29,7 +29,7 @@ import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairUserInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.*;
-import com.java110.intf.feeAccountDetail.IFeeAccountDetailServiceSMO;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.po.accountDetail.AccountDetailPo;
 import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;

service-fee/src/main/java/com/java110/fee/smo/impl/FeeAccountDetailServiceSMOImpl.java

@@ -4,7 +4,7 @@ import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
 import com.java110.fee.dao.IFeeAccountDetailServiceDao;
-import com.java110.intf.feeAccountDetail.IFeeAccountDetailServiceSMO;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.po.feeAccountDetail.FeeAccountDetailPo;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;