修改app查询公司问题

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddMemberDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddMemberDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import java.time.format.DateTimeFormatter;
 
 @Data

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddOrderCommonDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddRentVehicleDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddRentVehicleDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
-import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
-import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
-import com.xxfc.platform.vehicle.entity.AccompanyingItem;
+import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddTourDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddTourDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
 @Data

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/BgAddRentDTO.java

+package com.xxfc.platform.order.pojo.order.add;
+
+import lombok.Data;
+
+@Data
+public class BgAddRentDTO extends AddRentVehicleDTO {
+
+    /**
+     * 用户订单
+     */
+    Integer userId;
+}

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

@@ -37,7 +37,6 @@ import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
-import com.xxfc.platform.vehicle.pojo.QueryMultiDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
@@ -49,14 +48,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.xxfc.platform.order.pojo.AddRentVehicleDTO.DEFAULT_DATE_TIME_FORMATTER;
+import static com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO.DEFAULT_DATE_TIME_FORMATTER;
 
 @Controller
 @RequestMapping("baseOrder")

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -9,15 +8,12 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
-import com.xxfc.platform.order.pojo.AddMemberDTO;
-import com.xxfc.platform.order.pojo.AddTourDTO;
+import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
 import com.xxfc.platform.order.pojo.order.MemberBO;
-import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.service.OrderMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -13,7 +13,7 @@ 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.pojo.AddRentVehicleDTO;
+import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
@@ -100,6 +100,51 @@ public class OrderRentVehicleController extends CommonBaseController {
             return ObjectRestResponse.succ(bo.getOrder());
         }
 
+        @RequestMapping(value = "back-stage/add",method = RequestMethod.POST)
+        @ResponseBody
+        @ApiOperation(value = "后台人员为客户下租车订单")
+        public ObjectRestResponse<BaseOrder> backStagedd(@RequestBody AddRentVehicleDTO vo){
+                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());
+                                }
+                        }
+                }
+                if(vo.getStartCompanyId() != null) {
+                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
+                        if(companyDetail != null) {
+                                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());
+                        setBookEndDate(vo.getBookEndDate());
+                }});
+                bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+                bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())?
+                        StrUtil.splitTrim(vo.getTickerNos(), ","):null);
+                bo.setAccompanyItems(vo.getAccompanyItems());
+                orderRentVehicleService.createOrder(bo);
+                return ObjectRestResponse.succ(bo.getOrder());
+        }
+
         @RequestMapping(value = "list-by-order/{orderId}",method = RequestMethod.GET)
         @ResponseBody
         @ApiOperation(value = "租车列表by订单Id")

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

@@ -12,7 +12,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderTourDetail;
-import com.xxfc.platform.order.pojo.AddTourDTO;
+import com.xxfc.platform.order.pojo.order.add.AddTourDTO;
 import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.pojo.price.TourPriceVO;
 import com.xxfc.platform.order.service.OrderTourService;