Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -198,7 +198,8 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return null;
     }
-
+    
+    @CacheClear(pre = "user{1}")
     public void disable(AppUserLogin appUserLogin) {
       mapper.updateByPrimaryKeySelective(appUserLogin);
     }
@@ -214,7 +215,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         mapper.deleteByExample(example);
     }
 
-//    @CacheClear(pre = "appUser{1}")
+    @CacheClear(pre = "user{1}")
     @Transactional(rollbackFor = Exception.class)
     public void deleteAppUserById(Integer id) {
         AppUserLogin appUserLogin = new AppUserLogin();

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -14,12 +13,11 @@ import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.order.pojo.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
@@ -31,13 +29,10 @@ import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
-import javax.persistence.Column;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("orderRentVehicle")
@@ -77,9 +72,16 @@ public class OrderRentVehicleController extends CommonBaseController {
                         }else {
                                 BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
                                 vo.setEndCompanyId(endCompany.getId());
+                                vo.setEndAddr(endCompany.getAddrDetail());
                         }
                 }
             }
+            if(vo.getStartCompanyId() != null) {
+                    CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
+                    if(companyDetail != null) {
+                            vo.setStartAddr(companyDetail.getAddrDetail());
+                    }
+            }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
             bo.setBookVehicleVO(new BookVehicleVO(){{
                     setBookStartDate(vo.getBookStartDate());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BookVehicleVO.java

@@ -102,4 +102,5 @@ public class BookVehicleVO {
 
     private String upkeepIds;
 
+    private String orderNo;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -362,6 +362,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
         vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
         vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
+        vehicleBookRecord.setOrderNo(bookVehicleVo.getOrderNo());
         vehicleBookRecordBiz.save(vehicleBookRecord);
 //        //添加预定时间记录
 //