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

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

@@ -62,7 +62,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
      * @param parentId
      */
     public   void bindRelation(Integer userId,Integer parentId,Integer type){
-        if (userId==parentId){
+        if (userId.equals(parentId)){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }

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

@@ -330,6 +330,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 newValue.setCrosstownId(orderVehicleCrosstown.getId());
                 newValue.setId(null);
                 orderDepositRefundRecordBiz.save(newValue);
+                DepositRefundRecord nextValue = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
+                if(nextValue != null) {
+                    nextValue.setRestAmount(newValue.getRestAmount());
+                    orderDepositRefundRecordBiz.update(nextValue);
+                }
             } else {
                 throw new BaseException("定损记录不存在！请联系客服");
             }

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

@@ -72,14 +72,14 @@ public class OrderRentVehicleController extends CommonBaseController {
                         }else {
                                 BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
                                 vo.setEndCompanyId(endCompany.getId());
-                                vo.setEndAddr(endCompany.getAddrDetail());
+                                vo.setEndAddr(endCompany.detailAddr());
                         }
                 }
             }
             if(vo.getStartCompanyId() != null) {
                     CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
                     if(companyDetail != null) {
-                            vo.setStartAddr(companyDetail.getAddrDetail());
+                            vo.setStartAddr(companyDetail.detailAddr());
                     }
             }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);