修复 只有物业费时需要建筑面积 集团物业费，但是停车费时不需要建筑面积来计算的问题

Author: 928255095

Api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java

@@ -5,6 +5,7 @@
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
 import com.java110.common.constant.BusinessTypeConstant;
 import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.FeeTypeConstant;
 import com.java110.common.constant.ResponseConstant;
 import com.java110.common.constant.ServiceCodeConstant;
 import com.java110.common.exception.ListenerExecuteException;
@@ -130,16 +131,7 @@ private JSONObject addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlow
 
         feeDto = feeDtos.get(0);
         paramInJson.put("feeInfo",feeDto);
-        RoomDto roomDto = new RoomDto();
-        roomDto.setRoomId(feeDto.getPayerObjId());
-        roomDto.setCommunityId(feeDto.getCommunityId());
-        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
-        if (roomDtos == null || roomDtos.size() != 1){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据");
-        }
 
-        roomDto = roomDtos.get(0);
-        String builtUpArea = roomDto.getBuiltUpArea();
 
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setFeeTypeCd(feeDto.getFeeTypeCd());
@@ -150,6 +142,23 @@ private JSONObject addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlow
         }
 
         feeConfigDto = feeConfigDtos.get(0);
+        String builtUpArea = "0.00";
+
+        //物业费时 需要建筑面积 但是停车费不需要建筑面积
+        if(FeeTypeConstant.FEE_TYPE_PROPERTY.equals(feeConfigDto.getFeeTypeCd())) {
+
+            RoomDto roomDto = new RoomDto();
+            roomDto.setRoomId(feeDto.getPayerObjId());
+            roomDto.setCommunityId(feeDto.getCommunityId());
+            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+            if (roomDtos == null || roomDtos.size() != 1) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据");
+            }
+            roomDto = roomDtos.get(0);
+            builtUpArea = roomDto.getBuiltUpArea();
+        }
+
+
 
         double receivableAmount = Double.parseDouble(feeConfigDto.getSquarePrice())
                                     * Double.parseDouble(builtUpArea)

WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java

@@ -22,12 +22,13 @@ public class PropertyPayComponent {
     private IFeeServiceSMO feeServiceSMOImpl;
 
     public ResponseEntity<String> loadPropertyConfigData(IPageData pd) {
-        return feeServiceSMOImpl.loadPropertyConfigFee(pd, FeeTypeConstant.FEE_TYPE_PROPERTY);
+        return feeServiceSMOImpl.loadPropertyConfigFee(pd, "");
     }
 
 
     /**
      * 缴费
+     *
      * @param pd 页面数据封装
      * @return 缴费接口
      */

WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java

@@ -10,7 +10,6 @@
 import com.java110.core.context.IPageData;
 import com.java110.web.core.BaseComponentSMO;
 import com.java110.web.smo.IFeeServiceSMO;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +51,9 @@ public ResponseEntity<String> loadPropertyConfigFee(IPageData pd, String feeType
         String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
         //数据校验是否 商户是否入驻该小区
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
-        paramIn.put("feeTypeCd", feeTypeCd);
+        if (!StringUtil.isEmpty(feeTypeCd)) {
+            paramIn.put("feeTypeCd", feeTypeCd);
+        }
         responseEntity = this.callCenterService(restTemplate, pd, "",
                 ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig" + mapToUrlParam(paramIn),
                 HttpMethod.GET);
@@ -121,6 +122,7 @@ public ResponseEntity<String> loadParkingSpaceConfigFee(IPageData pd) {
 
         return responseEntity;
     }
+
     @Override
     public ResponseEntity<String> payFee(IPageData pd) {
         validatePayFee(pd);
@@ -264,7 +266,7 @@ public ResponseEntity<String> saveOrUpdatePropertyFeeConfig(IPageData pd) {
         String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
         //数据校验是否 商户是否入驻该小区
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
-            paramIn.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
+        paramIn.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
         if (!paramIn.containsKey("configId") || StringUtil.isEmpty(paramIn.getString("configId"))) {
             responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                     ServiceConstant.SERVICE_API_URL + "/api/fee.saveFeeConfig",
@@ -340,7 +342,6 @@ private void validateLoadParkingSpaceFee(IPageData pd) {
     }
 
 
-
     /**
      * 校验缴费参数
      *

WebService/src/main/resources/components/property-pay/propertyPay.js

@@ -38,6 +38,8 @@
                 vc.component.propertyPayInfo.feeTypeCd = _params.feeTypeCd;
                 vc.component.propertyPayInfo.builtUpArea = _params.builtUpArea;
                 vc.component.propertyPayInfo.communityId = vc.getCurrentCommunity().communityId;
+
+                 vc.component.loadPropertyConfigFee();
             });
         },
         methods:{
@@ -132,20 +134,21 @@
                                              remark:'',
                                              builtUpArea:'',
                                              feeId:'',
+                                             feeTypeCd:'',
                                              squarePrice:'',
                                              additionalAmount:'',
                                              communityId:''
                                          };
-                vc.component.loadPropertyConfigFee();
+
 
             },
             //加载配置数据
             loadPropertyConfigFee:function(){
                 var param = {
                     params:{
                         communityId:vc.getCurrentCommunity().communityId,
+                        feeTypeCd: vc.component.propertyPayInfo.feeTypeCd,
                         configId:'',
-                        feeTypeCd: vc.component.propertyPayInfo.feeTypeCd
                     }
                 };
                 vc.http.get(

WebService/src/main/resources/components/view-main-parkingSpace-fee/viewMainParkingSpaceFee.js

@@ -49,7 +49,8 @@
             openPayModel:function(){
                 vc.emit($props.payName,'openPayModel',{
                     feeId:vc.component.mainParkingSpaceFeeInfo.feeId,
-                    feeTypeCd:vc.component.mainParkingSpaceFeeInfo.feeTypeCd
+                    feeTypeCd:vc.component.mainParkingSpaceFeeInfo.feeTypeCd,
+                    builtUpArea:"0.00"
                 });
             },
             loadMainParkingSpaceFeeInfo:function(_parkingSPace){