停车位出租 退款时 bug 修复

Api/src/main/java/com/java110/api/listener/parkingSpace/ExitParkingSpaceListener.java

@@ -183,11 +183,16 @@ public class ExitParkingSpaceListener extends AbstractServiceApiDataFlowListener
         feeDto.setIncomeObjId(paramInJson.getString("storeId"));
         feeDto.setPayerObjId(paramInJson.getString("psId"));
         feeDto.setFeeTypeCd("1001".equals(parkingSpaceDto.getTypeCd())
-                ? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+                ? ("H".equals(parkingSpaceDto.getState())
+                        ? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE
+                        : FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE)
+                : ("H".equals(parkingSpaceDto.getState())
+                        ?FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
+                        :FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE));
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
 
         if (feeDtos == null || feeDtos.size() != 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据存在问题，物业费对应关系不是一条");
+            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据存在问题，停车费对应关系不是一条");
         }
 
 

WebService/src/main/resources/components/add-car/addCar.js

@@ -4,6 +4,9 @@
 (function(vc){
 
     vc.extends({
+        propTypes: {
+            callBackComponent:vc.propTypes.string
+        },
         data:{
             addCarInfo:{
                 carNum:'',
@@ -17,7 +20,7 @@
             addCarInfo:{
                 deep: true,
                 handler:function(){
-                    vc.emit('sellCar','notify',vc.component.addCarInfo);
+                    vc.emit($props.callBackComponent,'notify',vc.component.addCarInfo);
 
                 }
              }

WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html

@@ -1,10 +1,13 @@
 <div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
 
-    <vc:create name="addCar"></vc:create>
+    <vc:create name="addCar"
+               callBackComponent="hireParkingSpace"
+    >
+    </vc:create>
 
     <!-- 选择 业主信息 -->
     <vc:create name="sellRoomSelectOwner"
-               callBackComponent = "sellCar"
+               callBackComponent = "hireParkingSpace"
     ></vc:create>
 
     <!-- 选择停车位 -->

WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.js

@@ -33,7 +33,7 @@
 
         },
         watch:{
-                    "propertyPayInfo.cycles":{//深度监听，可监听到对象、数组的变化
+                    "hireParkingSpace.cycles":{//深度监听，可监听到对象、数组的变化
                         handler(val, oldVal){
                             vc.component.computeReceivableAmount(val);
                         },
@@ -41,7 +41,7 @@
                     }
         },
         _initEvent:function(){
-            vc.on('sellCar','notify',function(_param){
+            vc.on('hireParkingSpace','notify',function(_param){
                   vc.copyObject(_param,vc.component.hireParkingSpace);
                   vc.copyObject(_param,vc.component.hireParkingSpace.ownerInfo);
 
@@ -201,6 +201,9 @@
 
             },
             computeReceivableAmount:function(_cycles){
+                        if(_cycles == null || _cycles == "" || _cycles == undefined){
+                            _cycles = "0.00";
+                        }
                         vc.component.hireParkingSpace.receivableAmount = (parseFloat(vc.component.hireParkingSpace.additionalAmount) * parseFloat(_cycles)).toFixed(2);
                         vc.component.hireParkingSpace.receivedAmount = vc.component.hireParkingSpace.receivableAmount;
             }

WebService/src/main/resources/components/sell-car/sellCar.html

@@ -1,6 +1,8 @@
 <div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
 
-    <vc:create name="addCar"></vc:create>
+    <vc:create name="addCar"
+               callBackComponent="sellCar"
+    ></vc:create>
 
     <!-- 选择 业主信息 -->
     <vc:create name="sellRoomSelectOwner"