添加代码

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java

@@ -67,9 +67,13 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
             return w;
         });
 
-        if(list.size() > 0) {
+        if(list.size() > 0 ) {
+            for(SpecialRent specialRent : list) {
+                if(specialRent.getStartCompanyId().equals(specialRent.getEndCompanyId())) {
                     return Boolean.TRUE;
                 }
+            }
+        }
         return Boolean.FALSE;
     }
 
@@ -128,7 +132,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
             specialRent.setEndCityCode(companyDetail.getAddrCity());
         }
         if(null != specialRent.getCategoryId()) {
-            VehicleCategory vehicleCategory = vehicleFeign.getVehicleCategory(specialRent.getEndCompanyId()).getData();
+            VehicleCategory vehicleCategory = vehicleFeign.getVehicleCategory(specialRent.getCategoryId()).getData();
             specialRent.setBrandName(vehicleCategory.getBrandName());
             specialRent.setCategoryName(vehicleCategory.getName());
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java

@@ -76,16 +76,35 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         return ObjectRestResponse.succ();
     }
 
-    @RequestMapping(value = "/appBusiness/cnlRent", method = RequestMethod.POST)
+    @RequestMapping(value = "/appBusiness/cnlRent", method = RequestMethod.DELETE)
     @ResponseBody
     @ApiOperation(value = "取消发布特惠租车")
     public ObjectRestResponse appBusinessCnlRent(@RequestBody SpecialRent specialRent) {
         UserDTO userDTO = getBusinessUserByAppUser();
 
+        //查询
+        SpecialRent specialRentDB = baseBiz.selectById(specialRent.getId());
+        AssertUtils.isBlank(specialRentDB);
+        if(SpecialRent.STATUS_CRT != specialRentDB.getStatus()) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+
         //拒绝原来的预约
         orderRentVehicleService.errorRejectVehicle(new RentVehicleBO(){{
-            setBookRecordId(specialRent.getBookRecordId());
+            setBookRecordId(specialRentDB.getBookRecordId());
+        }});
+
+        //设置车辆上架
+        ObjectRestResponse restResponse = vehicleFeign.updVehicleFeign(new Vehicle(){{
+            setId(specialRentDB.getVehicleId());
+            setState(STATE_UP);
         }});
+
+        baseBiz.updateSelectiveById(new SpecialRent(){{
+            setId(specialRentDB.getId());
+            setStatus(SpecialRent.STATUS_CNL);
+        }});
+
         return ObjectRestResponse.succ();
     }