Browse Source

修改7天退款判断bug

吴学文 6 years ago
parent
commit
159a9035eb

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

@@ -248,7 +248,7 @@ public class ExitParkingSpaceListener extends AbstractServiceApiDataFlowListener
         calc.setTime(ownerCarDto.getCreateTime());
         calc.add(Calendar.DATE, 7);
 
-        if (calc.getTime().getTime() > DateUtil.getCurrentDate().getTime()) {
+        if (calc.getTime().getTime() < DateUtil.getCurrentDate().getTime()) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "只有在7天内才能退款,现已经过期,无法退款");
         }
 

+ 13 - 2
WebService/src/main/resources/components/sell-car/sellCar.js

@@ -14,7 +14,16 @@
                 psId:'',
                 typeCd:'',
                 receivableAmount: "0.00",
-                receivedAmount:"0.00"
+                receivedAmount:"0.00",
+                ownerInfo:{
+                    ownerId:"",
+                    name:"",
+                    age:"",
+                    sex:"",
+                    userName:"",
+                    remark:"",
+                    link:"",
+                },
             }
         },
         _initMethod:function(){
@@ -23,6 +32,8 @@
         _initEvent:function(){
             vc.on('sellCar','notify',function(_param){
                   vc.copyObject(_param,vc.component.sellCarInfo);
+                  vc.copyObject(_param,vc.component.sellCarInfo.ownerInfo);
+
 
                   if(_param.hasOwnProperty("typeCd")){
                         vc.component.computeReceivableAmount();
@@ -128,7 +139,7 @@
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         if(res.status == 200){
                             //关闭model
-                            vc.jumpToPage("/flow/ownerParkingSpaceFlow?" + vc.objToGetParam(vc.component.sellCarInfo.ownerInfo));
+                            vc.jumpToPage("/flow/ownerParkingSpaceFlow?" + vc.objToGetParam(vc.component.sellRoomInfo.ownerInfo));
                             return ;
                         }
                         vc.message(json);