Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -18,7 +18,11 @@ 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.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;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +36,7 @@ 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
@@ -52,13 +57,28 @@ public class OrderRentVehicleController extends CommonBaseController {
         @Autowired
         UserFeign userFeign;
 
+        @Autowired
+        VehicleFeign vehicleFeign;
+
         @RequestMapping(value = "add",method = RequestMethod.POST)
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
-            if(null == vo.getBookEndDate() || null == vo.getBookStartDate()
-                    || vo.getBookStartDate().equals(0) || vo.getBookEndDate().equals(0)) {
-                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
+            if(null == vo.getEndCompanyId() || vo.getEndCompanyId().equals(0)) {
+                if(StrUtil.isBlank(vo.getEndAddr())) {
+                        throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
+                }else {
+                        Map<String, Object> map = BeanUtil.beanToMap(new BranchCompany(){{
+                                setName(vo.getEndAddr());
+                        }}, false, true);
+                        List<BranchCompany> data = vehicleFeign.branchCompanyEntityList(map).getData();
+                        if(null == data) {
+                                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
+                        }else {
+                                BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
+                                vo.setEndCompanyId(endCompany.getId());
+                        }
+                }
             }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
             bo.setBookVehicleVO(new BookVehicleVO(){{

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

@@ -158,10 +158,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                     return RestResponse.suc();
                 }
             }
+            if(vehicleBookRecordQueryVo.getLiftCompany() != null) {
+                if(companyList.contains(vehicleBookRecordQueryVo.getLiftCompany())) { //如果权限中有这个公司就允许查询， 否则就直接返回空
+                    companyList.clear();
+                    companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
+                } else {
+                    return RestResponse.suc();
+                }
+            }
         } else {
             if(vehicleBookRecordQueryVo.getCompanyId() != null) {
                 companyList.add(vehicleBookRecordQueryVo.getCompanyId());
             }
+            if(vehicleBookRecordQueryVo.getLiftCompany() != null) {
+                companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
+            }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -425,11 +425,14 @@
                 and v1.book_type = #{bookType}
             </if>
             <if test="companyIds != null and companyIds.size > 0">
-                and v1.lift_company in
+                and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
-
+                or v1.ret_company in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>)
             </if>
             and v1.status between 1 and 2 and v1.book_user != -2
         </where>