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

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

@@ -199,11 +199,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         return null;
     }
 
-    @CacheClear(pre = "user{1}")
+    @CacheClear(pre = "user{1.id}")
     public void disable(AppUserLogin appUserLogin) {
       mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 
+    @CacheClear(pre = "user{1.id}")
     public void available(AppUserLogin appUserLogin) {
         mapper.updateByPrimaryKeySelective(appUserLogin);
     }

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

@@ -438,7 +438,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
                 setExchange(ORDER_TOPIC);
             }};
-            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
+            //sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
             switch (sign) {
                 case 2:
                     sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);

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

@@ -72,7 +72,6 @@ public class OrderRentVehicleController extends CommonBaseController {
                         }else {
                                 BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
                                 vo.setEndCompanyId(endCompany.getId());
-                                vo.setEndAddr(endCompany.detailAddr());
                         }
                 }
             }
@@ -82,6 +81,12 @@ public class OrderRentVehicleController extends CommonBaseController {
                             vo.setStartAddr(companyDetail.detailAddr());
                     }
             }
+                if(vo.getEndCompanyId() != null) {
+                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getEndCompanyId()).getData();
+                        if(companyDetail != null) {
+                                vo.setEndAddr(companyDetail.detailAddr());
+                        }
+                }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
             bo.setBookVehicleVO(new BookVehicleVO(){{
                     setBookStartDate(vo.getBookStartDate());