优化停车费信息

java110-utils/src/main/java/com/java110/utils/constant/FeeTypeConstant.java

@@ -22,6 +22,12 @@ public class FeeTypeConstant {
      */
     public static final String FEE_TYPE_PROPERTY = "888800010001";
 
+    /**
+     * 物业费
+     */
+    public static final String FEE_TYPE_CAR = "888800010008";
+
+
 
 
     /**

service-api/src/main/java/com/java110/api/bmo/community/ICommunityBMO.java

@@ -76,6 +76,15 @@ public interface ICommunityBMO extends IApiBaseBMO {
      */
     public void addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext);
 
+    /**
+     * 添加停车费
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void addFeeConfigParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
     /**
      * 添加小区信息
      *

service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java

@@ -252,6 +252,36 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
         super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
     }
 
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void addFeeConfigParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
+        JSONObject businessFeeConfig = new JSONObject();
+        businessFeeConfig.putAll(paramInJson);
+        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
+        businessFeeConfig.put("feeName", "停车费[系统默认]");
+        businessFeeConfig.put("feeFlag", "2006012");
+        businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        businessFeeConfig.put("endTime", DateUtil.LAST_TIME);
+        businessFeeConfig.put("computingFormula", "2002");
+        businessFeeConfig.put("squarePrice", "0.00");
+        businessFeeConfig.put("additionalAmount", "0.00");
+        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
+        businessFeeConfig.put("configId", paramInJson.getString("configId"));
+        businessFeeConfig.put("billType", "003");//按天出账
+        businessFeeConfig.put("paymentCd", "1200");
+        businessFeeConfig.put("paymentCycle", "1");//按月出账
+        businessFeeConfig.put("isDefault", "T");
+        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
+    }
+
     /**
      * 添加小区信息
      *
@@ -263,7 +293,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
         paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
         JSONObject businessFeeConfig = new JSONObject();
         businessFeeConfig.putAll(paramInJson);
-        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE);
+        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
         businessFeeConfig.put("feeName", "地上出售车位费[系统默认]");
         businessFeeConfig.put("feeFlag", "2006012");
         businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -293,7 +323,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
         paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
         JSONObject businessFeeConfig = new JSONObject();
         businessFeeConfig.putAll(paramInJson);
-        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
         businessFeeConfig.put("feeName", "地下出售车位费[系统默认]");
         businessFeeConfig.put("feeFlag", "2006012");
         businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -323,7 +353,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
         paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
         JSONObject businessFeeConfig = new JSONObject();
         businessFeeConfig.putAll(paramInJson);
-        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE);
+        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
         businessFeeConfig.put("feeName", "地上出租车位费[系统默认]");
         businessFeeConfig.put("feeFlag", "1003006");
         businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -353,7 +383,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
         paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
         JSONObject businessFeeConfig = new JSONObject();
         businessFeeConfig.putAll(paramInJson);
-        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE);
+        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
         businessFeeConfig.put("feeName", "地下出租车位费[系统默认]");
         businessFeeConfig.put("feeFlag", "1003006");
         businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));

service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.parkingSpace.IParkingSpaceBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.community.IParkingSpaceInnerServiceSMO;
 import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
 import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-import com.java110.core.smo.community.IParkingSpaceInnerServiceSMO;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerCarDto;
@@ -326,14 +326,14 @@ public class ParkingSpaceBMOImpl extends ApiBaseBMO implements IParkingSpaceBMO
 
         // 计算feeTypeCd
 
-        String feeTypeCd = "1001".equals(parkingSpaceDto.getTypeCd())
-                ? (this.isHireParkingSpace(paramInJson)
-                ? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE
-                : FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE)
-                : (this.isHireParkingSpace(paramInJson)
-                ? FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
-                : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
-
+//        String feeTypeCd = "1001".equals(parkingSpaceDto.getTypeCd())
+//                ? (this.isHireParkingSpace(paramInJson)
+//                ? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE
+//                : FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE)
+//                : (this.isHireParkingSpace(paramInJson)
+//                ? FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
+//                : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+        String feeTypeCd = FeeTypeConstant.FEE_TYPE_CAR;
         paramInJson.put("feeTypeCd", feeTypeCd);
 
         //计算 receivableAmount

service-api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java

@@ -39,10 +39,11 @@ public class SaveCommunityListener extends AbstractServiceApiPlusListener {
         communityBMOImpl.addCommunityMembers(reqJson, context);
         //产生物业费配置信息
         communityBMOImpl.addFeeConfigProperty(reqJson, context);
-        communityBMOImpl.addFeeConfigParkingSpaceUpSell(reqJson, context); // 地上出售
-        communityBMOImpl.addFeeConfigParkingSpaceDownSell(reqJson, context); // 地下出售
-        communityBMOImpl.addFeeConfigParkingSpaceUpHire(reqJson, context);//地上出租
-        communityBMOImpl.addFeeConfigParkingSpaceDownHire(reqJson, context);//地下出租
+//        communityBMOImpl.addFeeConfigParkingSpace(reqJson, context); // 地上出售
+//       communityBMOImpl.addFeeConfigParkingSpaceUpSell(reqJson, context); // 地上出售
+//        communityBMOImpl.addFeeConfigParkingSpaceDownSell(reqJson, context); // 地下出售
+//        communityBMOImpl.addFeeConfigParkingSpaceUpHire(reqJson, context);//地上出租
+//        communityBMOImpl.addFeeConfigParkingSpaceDownHire(reqJson, context);//地下出租
         communityBMOImpl.addFeeConfigParkingSpaceTemp(reqJson, context);//地下出租
 
     }

service-front/src/main/java/com/java110/front/components/parkingSpace/HireParkingSpaceFeeComponent.java

@@ -32,8 +32,7 @@ public class HireParkingSpaceFeeComponent {
     public ResponseEntity<String> loadSellParkingSpaceConfigData(IPageData pd) {
         String paramIn = pd.getReqData();
         JSONObject paramObj = JSONObject.parseObject(paramIn);
-        return feeServiceSMOImpl.loadPropertyConfigFee(pd, "1001".equals(paramObj.getString("typeCd"))
-                ? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE);
+        return feeServiceSMOImpl.loadPropertyConfigFee(pd,FeeTypeConstant.FEE_TYPE_CAR);
     }
 
     public IFeeServiceSMO getFeeServiceSMOImpl() {