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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserCommentFindDTO.java

@@ -35,5 +35,7 @@ public class UserCommentFindDTO extends PageParam{
     private  Integer isShow;
 
 
+    private  Integer commentId;
+
     private  Integer isDesc;
 }

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

@@ -276,24 +276,19 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			orderPageVo.setUsername(appUserVo.getRealname());
 			orderPageVo.setPositionName(appUserVo.getPositionName());
 		}
-		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+		List<Integer> companyIds = userDTO.getCompanyIds();
 
 		if (orderPageVo.getOrderRentVehicleDetail() != null) {
 
-			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
-				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
-			}
-			if (userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
-				orderPageVo.setUserCompanyStatus(true);
-			}
 			if (orderPageVo.getStatus() == 4) { //未交车
-//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-//                if (!flag) {
-//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
-//                }
+				if (companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) {
+					orderPageVo.setUserCompanyStatus(true);
+				}
 				getDriverInfo(orderPageVo);
 			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+				if (companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
+					orderPageVo.setUserCompanyStatus(true);
+				}
 				//设置违约金金额
 				getDriverInfo(orderPageVo);
 				getUserLicense(orderPageVo);
@@ -359,6 +354,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 //        System.out.println(a);
 //    }
 
+	/**
+	 * 计算延期费用
+	 * @param orderPageVO
+	 */
 	public void updateCrossRefund(OrderPageVO orderPageVO) {
 		//计算延期费用
 		DedDetailDTO dedDetailDTO = new DedDetailDTO();

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

@@ -110,15 +110,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
         for (OrderVehicleCrosstownDto value : list) {
-            if (value != null && value.getOrperaterId() != null && value.getType() != 1) {
-                UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData();
-                if (userDTO != null) {
-                    CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData();
-                    if (branchCompany != null) {
-                        value.setCustomerPhone(branchCompany.getVehiceServicePhone());
-                    }
-                }
-            }
+//            if (value != null && value.getOrperaterId() != null && value.getType() != 1) {
+//                UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData();
+//                if (userDTO != null) {
+//                    CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData();
+//                    if (branchCompany != null) {
+//                        value.setCustomerPhone(branchCompany.getVehiceServicePhone());
+//                    }
+//                }
+//            }
 
             if (value.getType() == 2 || value.getType() == 3) {
                 List<Coupon> c = baseOrderBiz.getReturnCouponByOrderId(value.getOrderId());

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

@@ -49,6 +49,7 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz, Orde
     OrderTourReceivedStatisticsBiz orderTourReceivedStatisticsBiz;
 
     @Autowired
+
     TourFeign tourFeign;
 
     @Autowired

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehicleApplyController.java

 package com.xxfc.platform.vehicle.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.BeanUtils;
 import com.xxfc.platform.vehicle.biz.VehicleApplyBiz;
 import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleApply;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleApplyFindDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,6 +52,19 @@ public class AppVehicleApplyController extends BaseController<VehicleApplyBiz> {
     }
 
 
+    @GetMapping("apply/detail/{id}")
+    @ApiModelProperty("商品审核详情")
+    public  ObjectRestResponse detail(@PathVariable("id") Integer id) {
+        VehicleApply vehicleApply = baseBiz.selectById(id);
+        Vehicle vehicle=new Vehicle();
+        BeanUtils.copyProperties(vehicleApply,vehicle);
+        vehicle.setId(vehicleApply.getVehicleId());
+        vehicle.setVehicleApplyId(vehicleApply.getId());
+        vehicle.setIsDel(0);
+        return ObjectRestResponse.succ(vehicle);
+    }
+
+