Merge branch 'master-bg-update' into dev

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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/bg/BgOrderListVo.java

+package com.xxfc.platform.order.pojo.bg;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class BgOrderListVo {
+	//订单号
+	private Integer orderId;
+	//用户名
+	private String username;
+	//手机号
+	private String telephone;
+	//车牌号
+	private String numberPlate;
+	//车辆名称
+	private String vehicleName;
+	//订单号
+	private String orderNo;
+	//订单状态
+	private Integer status;
+	//下单时间
+	private Date crtTime;
+	//交车时间
+	private Long startTime;
+	//还车时间
+	private Long endTime;
+	//交车公司
+	private String startCompanyName;
+	//还车公司
+	private String endCompanyName;
+	//订单金额
+	private BigDecimal realAmount;
+	//支付方式
+	private Integer payWay;
+	//订单详情ID
+	private Integer detailId;
+	//车辆编号
+	private Integer vehicleCode;
+}

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

+package com.xxfc.platform.order.biz;
+
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.mapper.BaseOrderMapper;
+import com.xxfc.platform.order.rest.BaseOrderController;
+import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements UserRestInterface {
+	@Autowired
+	UserFeign userFeign;
+	@Autowired
+	VehicleFeign vehicleFeign;
+	@Autowired
+	TourFeign tourFeign;
+	@Override
+	public UserFeign getUserFeign() {
+		return userFeign;
+	}
+
+	public ObjectRestResponse getAllOrderList(BaseOrderController.QueryOrderList dto) {
+		//判断token是否存在
+		UserDTO userDTO = getAdminUserInfo();
+		if (userDTO == null) {
+			return ObjectRestResponse.succ(new PageDataVO<>());
+		}
+
+		//获取权限公司列表
+		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+		//大区搜索
+		//有当前大区权限才能搜索到数据
+		if (dto.getZoneId() != null && (userDTO.getDataAll() == 1 || userDTO.getZoneId().equals(dto.getZoneId()) || userDTO.getDataZone().contains(dto.getZoneId()+""))) {
+			companyIds.clear();
+		}
+		//所属公司筛选
+		if (dto.getStartCompanyId() != null) {
+			if (companyIds.size() > 0) {
+				if (companyIds.contains(dto.getStartCompanyId())) {
+					companyIds.clear();
+					companyIds.add(dto.getStartCompanyId());
+				} else {
+					return ObjectRestResponse.succ(new PageDataVO<>());
+				}
+			} else {
+				companyIds.add(dto.getStartCompanyId());
+			}
+		}
+		dto.setCompanyIds(companyIds);
+		if (dto.getStartTime() != null) {
+			if (dto.getEndTime() == null) {
+				dto.setEndTime(new Date().getTime());
+			}
+		}
+		Query query = new Query(dto);
+		PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllOrderList(query.getSuper()));
+		return ObjectRestResponse.succ(pageDataVO);
+	}
+}

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

@@ -229,6 +229,73 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return ObjectRestResponse.succ(orderPageVo);
     }
 
+
+
+	public ObjectRestResponse<OrderPageVO> orderDetail(String no, UserDTO userDTO) {
+		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+		if (orderPageVo == null) {
+			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
+		}
+		AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
+		if(appUserVo != null) {
+			orderPageVo.setTelephone(appUserVo.getUsername());
+			orderPageVo.setUsername(appUserVo.getRealname());
+		}
+		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+
+		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, "今日不是交车日期");
+//                }
+				getDriverInfo(orderPageVo);
+			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+				//设置违约金金额
+				getDriverInfo(orderPageVo);
+				getUserLicense(orderPageVo);
+			}
+			ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId());
+			if (startResponse.getData() != null) {
+				orderPageVo.setStartCompanyName(startResponse.getData().getName());
+			}
+
+			ObjectRestResponse<CompanyDetail> restResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId());
+			if (restResponse.getData() != null) {
+				orderPageVo.setEndCompanyName(restResponse.getData().getName());
+			}
+			RestResponse<Vehicle> response = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+			if (response.getData() != null) {
+				orderPageVo.setVehicalNumberPlat(response.getData().getNumberPlate());
+				orderPageVo.setCode(response.getData().getCode());
+			}
+
+		} else if (orderPageVo.getOrderTourDetail() != null) {
+			if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
+				List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
+				orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
+			}
+		}
+
+		//设置保留金
+		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+		orderPageVo.setIllegalReserve(illegalReserve);
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+			setOrderId(orderPageVo.getId());
+		}}));
+		return ObjectRestResponse.succ(orderPageVo);
+	}
+
+
     //获取两个日期之间的天数（不包含头尾）
     public int getDaysBetweenDateTime(DateTime startDay, DateTime endDay) {
         int a = 0;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.pojo.bg.BgOrderListVo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
-import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -37,4 +36,7 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	List<MemberOrderBo> findMemberOrders(MemberOrderFindDTO memberOrderFindDTO);
 
+	public List<BgOrderListVo> getAllOrderList(Map<String, Object> paramMap);
+
+
 }

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

@@ -3,8 +3,6 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.druid.sql.visitor.functions.If;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -23,14 +21,10 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
-import com.xxfc.platform.order.biz.BaseOrderBiz;
-import com.xxfc.platform.order.biz.OrderItemBiz;
-import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
-import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
+import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.pojo.DetailsOfExpenses;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import com.xxfc.platform.order.pojo.order.*;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
@@ -50,13 +44,11 @@ import io.swagger.annotations.ApiOperation;
 import jodd.util.StringUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -103,7 +95,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @Resource
     VehicleFeign vehicleFeign;
 
-
+    @Autowired
+    BackgroundBaseOrderBiz backgroundBaseOrderBiz;
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -115,6 +108,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @CrossOrigin
     public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(BaseOrderController.QueryOrderList dto) {
+		UserDTO userDTO = getAdminUserInfo();
+		if (userDTO == null) {
+			return ObjectRestResponse.succ(new PageDataVO<>());
+		}
+
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
@@ -135,18 +133,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
-
-
-        UserDTO userDTO = getAdminUserInfo();
-        if (userDTO == null) {
-            return ObjectRestResponse.succ(new PageDataVO<>());
-        }
-        if (dto.getType() != null && dto.getType() != 3) {
-            List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-            List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
-            dto.setCompanyIds(companyIds);
-        }
-
+        //获取权限公司列表
+        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+        List<Integer> companyId = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+        dto.setCompanyIds(companyId);
+        //大区搜索
         if (dto.getZoneId() != null) {
             if (userDTO.getDataAll() != 1 && !dto.getZoneId().equals(userDTO.getZoneId())) {
                 return ObjectRestResponse.succ(new PageDataVO<>());
@@ -156,7 +147,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 dto.setZoneIds(zoneIds);
             }
         }
-
+        //所属公司筛选
         if (dto.getStartCompanyId() != null) {
             if (userDTO.getDataAll() != 1 && !dto.getStartCompanyId().equals(userDTO.getId())) {
                 return ObjectRestResponse.succ(new PageDataVO<>());
@@ -167,12 +158,18 @@ public class BackStageOrderController extends CommonBaseController implements Us
             }
         }
 
-
+        //根据车牌号或车辆编号获取订单信息
         if (StringUtils.isNotEmpty(dto.getPlateNumber()) || StringUtils.isNotEmpty(dto.getVehicleCode())) {
             List<String> vehicleIds = vehicleFeign.findbyPlateNumberAndVehicleCod(dto.getPlateNumber(), dto.getVehicleCode());
             dto.setVehicleIds(vehicleIds);
         }
-        Query query = new Query(dto);
+        //
+		if (dto.getStartTime() != null) {
+			if (dto.getEndTime() == null) {
+				dto.setEndTime(new Date().getTime());
+			}
+		}
+		Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
 
         List<OrderListVo> list = pageDataVO.getData();
@@ -368,7 +365,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ApiOperation(value = "交还车获取订单详情，带驾驶人信息")
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo) {
+    public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo, Boolean flag) {
         UserDTO userDTO = getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
@@ -376,7 +373,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if (StringUtils.isBlank(orderNo)) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        return baseOrderBiz.getOrderDetail(orderNo, userDTO);
+        if(flag != null && flag == true) {
+            return baseOrderBiz.orderDetail(orderNo, userDTO);
+        } else {
+            return baseOrderBiz.getOrderDetail(orderNo, userDTO);
+        }
     }
 
 
@@ -448,6 +449,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return baseOrderBiz.save(orderRentVehicleDetail);
     }
 
+    @GetMapping(value = "/getAll")
+    @ResponseBody
+    public ObjectRestResponse getAllOrderList(BaseOrderController.QueryOrderList dto) {
+        return backgroundBaseOrderBiz.getAllOrderList(dto);
+    }
+
     @Data
     public static class ChangeVehicleDTO {
         String no;

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -240,6 +240,86 @@
         </if>
 
     </select>
+    <select id="getAllOrderList" parameterType="Map" resultType="com.xxfc.platform.order.pojo.bg.BgOrderListVo">
+        SELECT
+        bc1.`name` AS startCompanyName,
+        bc2. NAME AS endCompanyName,
+        v1.number_plate AS numberPlate,
+        v1.code AS vehicleCode,
+        a1. NAME AS username,
+        a2.username AS telephone,
+        b1.id AS orderId,
+        b1.`no` AS orderNo,
+        b1.`status` as status,
+        b1.`name` as vehicleName,
+        b1.crt_time as crtTime,
+        o1.start_time as startTime,
+        o1.end_time as endTime,
+        b1.real_amount as realAmount,
+        b1.pay_way as payWay,
+        o1.id as detailId,
+        b1.pay_time as payTime
+        FROM
+        base_order b1
+        LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id
+        LEFT JOIN xxfc_vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
+        LEFT JOIN xxfc_vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
+        LEFT JOIN xxfc_vehicle.vehicle v1 ON v1.id = o1.vehicle_id
+        LEFT JOIN xxfc_third_platform.id_information a1 ON b1.user_id = a1.user_login_id
+        LEFT JOIN ag_admin_v2.app_user_login a2 ON a2.id = b1.user_id
+        <where>
+            <if test="userIds != null and userIds.size() > 0">
+                and b1.user_id in
+                <foreach collection="userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="phone != null and phone != ''">
+                and a2.username like CONCAT ("%", #{phone}, "%")
+            </if>
+            <if test="realName != null and realName != ''">
+                and a1.name like CONCAT ("%", #{realName}, "%")
+            </if>
+            <if test="userId != null">
+                and b1.user_id = #{userId}
+            </if>
+            <if test="status != null">
+                and b1.status = #{status}
+            </if>
+            <if test="type != null">
+                and b1.type = #{type}
+            </if>
+            <if test="no != null and no != '' ">
+                and b1.no like CONCAT ("%", #{no}, "%")
+            </if>
+            <if test="plateNumber != null and plateNumber != '' ">
+                and v1.number_plate like CONCAT ("%", #{plateNumber}, "%")
+            </if>
+            <if test="vehicleCode != null">
+                and v1.code = #{vehicleCode}
+            </if>
+            <if test="startTime != null">
+                and o1.start_time between #{startTime} and #{endTime}
+            </if>
+            <if test="companyIds != null and companyIds.size > 0">
+                and (o1.start_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                or
+                o1.end_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                )
+            </if>
+            <if test="zoneId != null">
+                and (bc1.zone_id = #{zoneId} or bc2.zone_id = #{zoneId})
+            </if>
+        </where>
+        order by b1.crt_time desc
+    </select>
+
 
     <select id="getTourList" parameterType="Map" resultMap="orderPageMap">
         select b.*