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

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/ObjectRestResponse.java

@@ -16,6 +16,8 @@ public class ObjectRestResponse<T> extends BaseResponse {
     private static final String RESULT_SUCCESS_MSG = "操作成功";
     private static final String RESULT_FAIL_MSG = "操作失败";
 
+    private static final String PARAM_IS_EMPTY = "参数为空";
+
     public boolean isRel() {
         return rel;
     }
@@ -73,6 +75,10 @@ public class ObjectRestResponse<T> extends BaseResponse {
         return new ObjectRestResponse().status(code).msg(SystemProperty.getResultConfig(code + "")).rel(false);
     }
 
+    public static ObjectRestResponse paramIsEmpty() {
+        return ObjectRestResponse.createFailedResult(502, ObjectRestResponse.PARAM_IS_EMPTY);
+    }
+
     /**
      * 创建一个异常的调用结果
      * @param message

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

@@ -55,6 +55,8 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
           TourGood tourGood=tourFeign.one(typeId);
           if(tourGood!=null){
               BeanUtils.copyProperties(collect,tourGood);
+              collect.setId(null);
+              collect.setStatus(0);
               insertSelective(collect);
           }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -241,8 +241,8 @@ public class AppPermissionService {
                     userLogin.setUsername(username);
                     appUserLoginBiz.updateSelectiveById(userLogin);
                 }
-                data.put("im_token",access_token);
-                data.put("im_UserId",imUserId);
+                data.put("imToken",access_token);
+                data.put("imUserId",imUserId);
             }
 
             if (data != null) {
@@ -282,7 +282,7 @@ public class AppPermissionService {
             // 返回结果
             // data.put("token", token);
             data.put("username", username);
-            data.put("userid", userid);
+            data.put("userId", userid);
 
         }
         return data;
@@ -366,8 +366,8 @@ public class AppPermissionService {
                     String imPassword=userLogin.getImPassword();
                     if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                         String  access_token=loginIm(username,imPassword,imUserId);
-                        data.put("im_token",access_token);
-                        data.put("im_UserId",imUserId);
+                        data.put("imToken",access_token);
+                        data.put("imUserId",imUserId);
                     }
                     if (data != null) {
                         return JsonResultUtil.createSuccessResultWithObj(data);
@@ -453,8 +453,8 @@ public class AppPermissionService {
         String imPassword=userLogin.getImPassword();
         if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
             String  access_token=loginIm(userLogin.getUsername(),imPassword,imUserId);
-            data.put("im_token",access_token);
-            data.put("im_UserId",imUserId);
+            data.put("imToken",access_token);
+            data.put("imUserId",imUserId);
         }
         if (data != null) {
             return JsonResultUtil.createSuccessResultWithObj(data);
@@ -495,8 +495,8 @@ public class AppPermissionService {
             String imPassword=user.getImPassword();
             if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                 String  access_token=loginIm(username,imPassword,imUserId);
-                data.put("im_token",access_token);
-                data.put("im_UserId",imUserId);
+                data.put("imToken",access_token);
+                data.put("imUserId",imUserId);
             }
             if (data != null) {
                 return JsonResultUtil.createSuccessResultWithObj(data);

ace-modules/ace-interface/src/main/java/com/github/wxiaoqi/security/api/vo/config/HeaderConfig.java

@@ -17,8 +17,6 @@ import java.util.Enumeration;
  * @description 设置请求头部信息，防止微服务之间调用请求头部信息丢失
  * @data 2019/6/25 16:22
  */
-@Configuration
-@Component
 public class HeaderConfig implements RequestInterceptor {
 
     @Override

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -31,10 +31,6 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
     }*/
 
     public List<Banner> findBannerList(Integer type) {
-        Banner banner = new Banner();
-        banner.setIsDel(0);
-        banner.setType(type);
-        //mapper.findByType(type);
         return  mapper.findBannerListByType(type);
     }
 

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopPageDTO.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.Objects;
 
 
 /**
@@ -92,5 +92,20 @@ public class CampsiteShopPageDTO implements Serializable {
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
-
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CampsiteShopPageDTO that = (CampsiteShopPageDTO) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }

xx-campsite/xx-campsite-server/pom.xml

@@ -6,6 +6,7 @@
         <groupId>com.xxfc.common</groupId>
         <artifactId>xx-common-platform-web</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xxfc.platform</groupId>

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -67,6 +67,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
             log.debug("根据type=【{}】查询到的店铺数据：【{}】",type,campsiteShopPageDTOS);
         }
         List<CampsiteShopPageVo> campsiteShopPageVoList = new ArrayList<>();
+        campsiteShopPageDTOS = campsiteShopPageDTOS.stream().distinct().collect(Collectors.toList());
         for (CampsiteShopPageDTO campsiteShopPageDTO : campsiteShopPageDTOS) {
             CampsiteShopPageVo campsiteShopPageVo = new CampsiteShopPageVo();
             BeanUtils.copyProperties(campsiteShopPageDTO,campsiteShopPageVo);

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -41,7 +41,7 @@
         FROM `campsite_shop_tag`  cst
         left JOIN `campsite_shop` cs on cst.shop_id=cs.id
         left JOIN `campsite_tag` ct on cst.tag_id=ct.id
-        where cs.sale_state=1
+        where cs.sale_state=1 and cs.is_del=0
         <if test="typeId!=null">
             and cst.tag_id=#{typeId}
         </if>

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -75,6 +75,7 @@ public class UserBiz {
         return  baseResponse;
     }
 
+
     /**
      * 登录
      * @param map

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/entity/ImComment.java

+package com.xxfc.platform.im.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Table(name = "im_comment")
+@Data
+public class ImComment {
+    @Id
+    private Long id;
+
+    /**
+     * 问题Id
+     */
+    @Column(name = "question_id")
+    private Long questionId;
+
+    /**
+     * 评论类容
+     */
+    private String content;
+
+    private Long time;
+
+    /**
+     * 用户id
+     */
+    @Column(name = "user_id")
+    private Long userId;
+
+    /**
+     * 是否显示
+     */
+    private Integer visible = 1;
+
+    /**
+     * 是否只有自己可见(评论审核时仅自己可见)
+     */
+    @Column(name = "visible_own")
+    private Integer visibleOwn = 1;
+
+    /**
+     * 状态
+     */
+    private Integer state = 0;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_del")
+    private Boolean isDel = false;
+
+
+}
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/entity/ImPraise.java

+package com.xxfc.platform.im.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Table(name = "im_praise")
+@Data
+public class ImPraise {
+    @Id
+    private Long id;
+
+    /**
+     * 问题id
+     */
+    @Column(name = "question_id")
+    private Long questionId;
+
+    /**
+     * 用户id
+     */
+    @Column(name = "user_id")
+    private Long userId;
+
+    /**
+     * 时间
+     */
+    private Long time;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    /**
+     * 是否显示
+     */
+    private Integer visible = 1;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_del")
+    private Boolean isDel = false;
+
+}
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/entity/ImQuestion.java

+package com.xxfc.platform.im.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Table(name = "im_question")
+@Data
+public class ImQuestion {
+    @Id
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 手机型号
+     */
+    private String model;
+
+    /**
+     * 添加时间
+     */
+    private Long time;
+
+    @Column(name = "user_id")
+    private Long userId;
+
+    /**
+     * 是否显示
+     *  1,显示， 0、不显示
+     */
+    private Integer visible = 1;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_del")
+    private Boolean isDel = false;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    private Integer commentCount;
+
+    private Integer praiseCount;
+
+}
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/mapper/ImCommentMapper.java

+package com.xxfc.platform.im.mapper;
+
+import com.xxfc.platform.im.entity.ImComment;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface ImCommentMapper extends Mapper<ImComment> {
+
+    List<ImComment> selectByQuestionId(Long questionId);
+
+}
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/mapper/ImPraiseMapper.java

+package com.xxfc.platform.im.mapper;
+
+import com.xxfc.platform.im.entity.ImPraise;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface ImPraiseMapper extends Mapper<ImPraise> {
+
+    List<ImPraise> selectByQuestionId(Long questionId);
+
+    List<ImPraise> selectByQuestionIdAndTime(ImPraise imPraise);
+
+}
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/mapper/ImQuestionMapper.java

+package com.xxfc.platform.im.mapper;
+
+import com.xxfc.platform.im.entity.ImQuestion;
+import com.xxfc.platform.im.vo.QuestionListVo;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ImQuestionMapper extends Mapper<ImQuestion> {
+
+    List<QuestionListVo> getQuestionList(Map<String, Object> param);
+
+}
\ No newline at end of file

xx-im/xx-im-server/src/main/resources/mapper/ImCommentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xxfc.platform.im.mapper.ImCommentMapper">
+  <resultMap id="BaseResultMap" type="com.xxfc.platform.im.entity.ImComment">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="question_id" jdbcType="BIGINT" property="questionId" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="time" jdbcType="BIGINT" property="time" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="visible" jdbcType="INTEGER" property="visible" />
+    <result column="visible_own" jdbcType="INTEGER" property="visibleOwn" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="is_del" jdbcType="BIT" property="isDel" />
+  </resultMap>
+
+  <select id="selectByQuestionId" resultType="com.xxfc.platform.im.entity.ImComment" parameterType="java.lang.Long">
+        select * from im_comment
+        where question_id = #{questionId} and is_del = 0
+  </select>
+
+</mapper>
\ No newline at end of file

xx-im/xx-im-server/src/main/resources/mapper/ImPraiseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xxfc.platform.im.mapper.ImPraiseMapper">
+  <resultMap id="BaseResultMap" type="com.xxfc.platform.im.entity.ImPraise">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="question_id" jdbcType="BIGINT" property="questionId" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="time" jdbcType="BIGINT" property="time" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="visible" jdbcType="INTEGER" property="visible" />
+    <result column="is_del" jdbcType="BIT" property="isDel" />
+  </resultMap>
+
+  <select id="selectByQuestionId" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="java.lang.Long">
+        select * from im_praise
+        where question_id = #{questionId} and is_del = 0 and visible = 1
+  </select>
+
+  <select id="selectByQuestionIdAndTime" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="com.xxfc.platform.im.dto.ImPraiseDto">
+        select * from im_praise
+        where question_id = #{questionId} and is_del = 0 and visible = 1
+        and time between #{startTime} and #{endTime}
+  </select>
+</mapper>
\ No newline at end of file

xx-im/xx-im-server/src/main/resources/mapper/ImQuestionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xxfc.platform.im.mapper.ImQuestionMapper">
+
+    <resultMap id="BaseResultMap" type="com.xxfc.platform.im.entity.ImQuestion">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="title" jdbcType="VARCHAR" property="title"/>
+        <result column="latitude" jdbcType="VARCHAR" property="latitude"/>
+        <result column="longitude" jdbcType="VARCHAR" property="longitude"/>
+        <result column="model" jdbcType="VARCHAR" property="model"/>
+        <result column="time" jdbcType="BIGINT" property="time"/>
+        <result column="user_id" jdbcType="BIGINT" property="userId"/>
+        <result column="visible" jdbcType="INTEGER" property="visible"/>
+        <result column="state" jdbcType="VARCHAR" property="state"/>
+        <result column="is_del" jdbcType="BIT" property="isDel"/>
+        <result column="content" jdbcType="LONGVARCHAR" property="content"/>
+    </resultMap>
+
+    <resultMap id="listResultMap" type="com.xxfc.platform.im.vo.QuestionListVo">
+        <collection property="imComment" column="id"
+                    select="com.xxfc.platform.im.mapper.ImCommentMapper.selectByQuestionId"
+                    ofType="com.xxfc.platform.im.entity.ImComment">
+        </collection>
+
+        <collection column="id" property="imPraise"
+                    select="com.xxfc.platform.im.mapper.ImPraiseMapper.selectByQuestionId"
+                    ofType="com.xxfc.platform.im.entity.ImPraise"></collection>
+    </resultMap>
+    <select id="getQuestionList" parameterType="java.util.Map" resultMap="listResultMap">
+        select * from im_question
+        <where>
+            <if test="userId != null">
+                and user_id = #{userId}
+            </if>
+            <if test="visible != null">
+                and visible = #{visible}
+            </if>
+            <if test="state != null">
+                and state = #{state}
+            </if>
+            <if test="isDel != null">
+                and is_del = #{isDel}
+            </if>
+        </where>
+        order by time DESC
+    </select>
+
+</mapper>
\ No newline at end of file

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

@@ -14,12 +14,10 @@ public class AddRentVehicleDTO{
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
     //开始时间
-    @Column(name = "start_time")
     @ApiModelProperty(value = "开始时间")
     private Long startTime;
 
     //结束时间
-    @Column(name = "end_time")
     @ApiModelProperty(value = "结束时间")
     private Long endTime;
 
@@ -36,12 +34,10 @@ public class AddRentVehicleDTO{
     private String bookEndDate;
 
     //天数
-    @Column(name = "day_num")
     @ApiModelProperty(value = "天数")
     private Integer dayNum;
 
     //取车地点
-    @Column(name = "start_addr")
     @ApiModelProperty(value = "取车地点")
     private String startAddr;
 
@@ -51,7 +47,6 @@ public class AddRentVehicleDTO{
     private String endAddr;
 
     //取车城市编号
-    @Column(name = "start_city")
     @ApiModelProperty(value = "取车城市编号")
     private Integer startCity;
 
@@ -61,7 +56,6 @@ public class AddRentVehicleDTO{
     private Integer endCity;
 
     //取车城市名称
-    @Column(name = "start_city_name")
     @ApiModelProperty(value = "取车城市名称")
     private String startCityName;
 
@@ -71,30 +65,34 @@ public class AddRentVehicleDTO{
     private String endCityName;
 
     //司机类型 1--公司司机；2--自己司机
-    @Column(name = "driver_type")
     @ApiModelProperty(value = "司机类型 1--公司司机；2--自己司机")
     private Integer driverType;
 
     //自己司机ids
-    @Column(name = "my_driver_ids")
     @ApiModelProperty(value = "自己司机ids")
     private String myDriverIds;
 
     //出发公司Id
-    @Column(name = "start_company_id")
     @ApiModelProperty(value = "出发公司Id")
     private Integer startCompanyId;
 
     //结束公司Id
-    @Column(name = "end_company_id")
     @ApiModelProperty(value = "结束公司Id")
     private Integer endCompanyId;
 
     //车型id
-    @Column(name = "model_id")
     @ApiModelProperty(value = "车型id")
     private Integer modelId;
 
+    //车型id
+    @ApiModelProperty(value = "是否购买免赔")
+    private Integer damageSafe;
+
+    /**
+     * 是否使用出租免费天数
+     */
+    private Integer rentFreeDay;
+
     public void setStartTime(Long startTime) {
         this.startTime = startTime;
         this.bookStartDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofHours(8)));

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

@@ -3,8 +3,10 @@ package com.xxfc.platform.order.pojo.order;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -14,7 +16,7 @@ public class OrderPageVO extends BaseOrder {
 
     OrderRentVehicleDetail orderRentVehicleDetail;
     OrderTourDetail orderTourDetail;
-
+    List<VehicleUserLicense> vehicleUserLicenses;
     private String username;
 
     private String vehicalNumberPlat;

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

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
@@ -15,7 +16,10 @@ import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +55,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    VehicleFeign vehicleFeign;
+
     @Autowired
     ThirdFeign thirdFeign;
 
@@ -69,6 +76,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     public List<OrderPageVO> getRentVehicle (Map<String, Object> paramMap) {
         return mapper.getRentVehicle(paramMap);
     }
+    public List<OrderPageVO> getTourList (Map<String, Object> paramMap) {
+        return mapper.getTourList(paramMap);
+    }
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -85,18 +95,47 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         }});
     }
 
+    /**
+     * 获取订单详情
+     * @param no
+     * @return
+     */
+    public OrderPageVO getOrderDetail(String no) {
+        OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+        String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
+        List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
+        if(StringUtils.isNotBlank(myDriverIds)) {
+           if(myDriverIds.contains(",")) {
+               String[] ids = myDriverIds.split(",");
+             try{
+                 for(String id : ids) {
+                     vehicleUserLicenses.add(vehicleFeign.one(Integer.parseInt(id)).getData());
+                 }
+             }catch (Exception e) {
+             }
+           } else {
+               try {
+                   vehicleUserLicenses.add(vehicleFeign.one(Integer.parseInt(myDriverIds)).getData());
+               }catch (Exception e){}
+           }
+        }
+        orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
+        return orderPageVo;
+    }
+
     /**
      * 取消订单
      * @param baseOrder
      */
     public void cancel(BaseOrder baseOrder) {
         if(cancelAble.get(baseOrder.getType()).contains(baseOrder.getStatus())) {
-            int updateResult = this.updateSelectiveByIdRe(new BaseOrder(){{
+            BaseOrder updateOrder = new BaseOrder(){{
                 setId(baseOrder.getId());
                 setStatus(OrderStatusEnum.ORDER_CANCEL.getCode());
                 setCancelReason(baseOrder.getCancelReason());
                 setVersion(baseOrder.getVersion());
-            }});
+            }};
+            int updateResult = this.updateSelectiveByIdRe(updateOrder);
 
             //如果取消失败，则抛异常
             if(updateResult <= 0) {

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

@@ -15,7 +15,14 @@ import java.util.Map;
  * @date 2019-05-15 21:30:33
  */
 public interface BaseOrderMapper extends Mapper<BaseOrder> {
+
 	public List<OrderPageVO> pageByParm(Map<String, Object> paramMap);
+
 	public List<OrderPageVO> listOrder(Map<String, Object> paramMap);
+
 	public List<OrderPageVO> getRentVehicle(Map<String, Object> paramMap);
+
+	public List<OrderPageVO> getTourList(Map<String, Object> paramMap);
+
+	public OrderPageVO getOrderDetail(String no);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -56,7 +56,7 @@ public class RabbitConsumer {
              * 其中的参数如果为true是把消息退回到queue但是有可能被其它的consumer(集群)接收到，
              * 设置为false是只补发给当前的consumer
              */
-            channel.basicRecover(false);
+            channel.basicRecover(true);
         }
     }
 }

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

@@ -141,9 +141,8 @@ public class BaseOrderController extends CommonBaseController {
                 dto.setEndTime(new Date().getTime());
             }
         }
-        dto.setType(1);
         Query query = new Query(dto);
-        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
+        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
@@ -156,10 +155,10 @@ public class BaseOrderController extends CommonBaseController {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
             }
+
         }
-        dto.setType(2);
         Query query = new Query(dto);
-        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
+        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getTourList(query.getSuper()));
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
@@ -181,6 +180,18 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
+    @GetMapping(value = "/orderDetail")
+    @ApiOperation(value = "交还车获取订单详情，带驾驶人信息")
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse getOrderDetail(String orderNo) {
+        if(StringUtils.isBlank(orderNo)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        return ObjectRestResponse.succ(baseOrderBiz.getOrderDetail(orderNo));
+    }
+
+
     @ApiOperation("结合后台人员所属公司查询订单详情")
     @RequestMapping(value = "/company/{no}", method = RequestMethod.GET)
     @IgnoreClientToken

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -87,30 +87,11 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         detail.setOrderId(detail.getOrder().getId());
         detailBiz.insertSelective(detail);
         detail.getOrder().setDetailId(detail.getId());
-        baseOrderBiz.updateSelectiveById(detail.getOrder());
+        int updateResult =baseOrderBiz.updateSelectiveByIdRe(detail.getOrder());
+        if(updateResult > 0) {
+            detail.getOrder().setVersion(detail.getOrder().getVersion() + 1);
+        }
     }
-
-//    /**
-//     * 创建订单及其多子项
-//     * @param details
-//     */
-//    public void createOrder(List<Detail> details) {
-//        BaseOrder order = createOrder();
-//        for(Detail detail : details) {
-//            preHandleDetail(order, detail);
-//        }
-//        handleDetail(details);
-//    }
-//
-//    /**
-//     * 处理订单多子项
-//     * @param details
-//     */
-//    public void handleDetail(List<Detail> details){
-//        for(Detail detail : details) {
-//            detailBiz.insertSelective(detail);
-//        }
-//    }
 
     /**
      * 计算价格

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -92,7 +92,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         super.handleDetail(bo);
 
         //发送定时取消订单(30分钟)
-        rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
+        //rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
+        rabbitProduct.sendDelayMessage(bo.getOrder(), 100L * 6 * 3);
     }
 
     @Override
@@ -136,7 +137,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");
-            switch (MemberEnum.getByCode(detail.getAppUserDTO().getIsMember())) {
+            switch (MemberEnum.getByCode(detail.getAppUserDTO().getMemberLevel())) {
                 case NORMAL:
                     modelAmount = handleDiscount(vehicleModel, prices, NORMAL);
                 break;
@@ -199,7 +200,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     private BigDecimal handleDiscount(VehicleModel vehicleModel, String[] prices, MemberEnum memberEnum) {
         BigDecimal modelAmount;//会员比例
         if(DISCOUNT_STATUS_MEMBER.equals(vehicleModel.getRentDiscountStatus())) {
-            modelAmount = new BigDecimal(String.valueOf((memberEnum.getPercent()/100))).multiply(vehicleModel.getPrice());
+            modelAmount = new BigDecimal(String.valueOf((memberEnum.getPercent()/100d))).multiply(vehicleModel.getPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
         }else {
             //会员固定价列表
             modelAmount = new BigDecimal(prices[(memberEnum.getCode() - 1)]);
@@ -220,7 +221,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             childrenStr.append(",${tem_0104}");
         }
         if(childrenStr.length() > 0){
-            childrenStr.deleteCharAt(1);
+            childrenStr.deleteCharAt(0);
         }
         return childrenStr.toString();
     }
@@ -242,6 +243,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     private void acquireVehicle(RentVehicleBO detail) {
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
+        rentVehicleBookDTO.setModelId(detail.getModelId());
         rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
         ObjectRestResponse<VehicleBookRecord> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
         detail.setVehicleId(orr.getData().getVehicleId());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -209,11 +209,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             childrenStr.append(",${tem_0203}");
         }
 
-        String str = childrenStr.toString();
-        if(str.length() > 0) {
-            str = str.substring(1, str.length());
+        if(childrenStr.length() > 0){
+            childrenStr.deleteCharAt(0);
         }
-        return str;
+        return childrenStr.toString();
     }
 
     /**

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

@@ -95,7 +95,30 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        <where>
+        where b.type = 1
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
+            <if test="status != null">
+                and b.status = #{status}
+            </if>
+            <if test="no != null">
+                and no like CONCAT ("%", #{no}, "%")
+            </if>
+            <if test="startTime != null">
+                and r.start_time between  #{startTime}  and  #{endTime}
+            </if>
+            <if test="startCompanyId != null">
+                and r.start_company_id = #{startCompanyId}
+            </if>
+        order by b.crt_time desc
+    </select>
+
+    <select id="getTourList" parameterType="Map" resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        LEFT JOIN order_tour_detail r on r.order_id = b.id
+        where b.type = 2
             <if test="userId != null">
                 and b.user_id = #{userId}
             </if>
@@ -111,8 +134,13 @@
             <if test="startCompanyId != null">
                 and r.start_company_id = #{startCompanyId}
             </if>
-        </where>
         order by b.crt_time desc
     </select>
 
+    <select id="getOrderDetail" parameterType="java.lang.String" resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        where no = #{no}
+    </select>
+
 </mapper>
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSiteDTO.java

@@ -31,7 +31,7 @@ public class GoodSiteDTO {
 
     //分公司id
 	@ApiModelProperty(value = "分公司id")
-	private String companyId;
+	private Integer companyId;
 
 	/**
 	 * 地址-省/直辖市(编码)

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSite.java

@@ -50,7 +50,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "company_id")
 	@ApiModelProperty(value = "分公司id")
-	private String companyId;
+	private Integer companyId;
 
 	/**
 	 * 地址-省/直辖市(编码)
@@ -64,7 +64,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "province_name")
 	@ApiModelProperty("地址-省/直辖市(名称)")
-	private Integer provinceName;
+	private String provinceName;
 
 	/**
 	 * 地址-市(编码)
@@ -78,7 +78,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "city_name")
 	@ApiModelProperty("地址-市(名称)")
-	private Integer cityName;
+	private String cityName;
 
 	/**
 	 *	出发时间

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

@@ -92,6 +92,6 @@ public interface TourFeign {
                                      @RequestParam(value = "limit",defaultValue = "4") Integer limit);
 
     //获取商品信息
-    @RequestMapping(value = "/app/unauth/one", method = RequestMethod.GET)
+    @RequestMapping(value = "/good/app/unauth/one", method = RequestMethod.GET)
     public TourGood one(@RequestParam(value = "goodId",defaultValue = "0") Integer goodId);
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -2,10 +2,7 @@ package com.xxfc.platform.vehicle.feign;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -51,5 +48,9 @@ public interface VehicleFeign {
     public  List<BranchCompany>  companyAll(
             @RequestParam(value = "dataAll")Integer dataAll,
             @RequestParam(value = "dataCompany")String dataCompany,
+
             @RequestParam(value = "dataZone")String dataZone);
+
+    @RequestMapping(value = "/user/license/one", method = RequestMethod.GET)
+    public RestResponse<VehicleUserLicense> one(@RequestParam(value="id",defaultValue="0")Integer  id) throws Exception;
 }

xx-vehicle/xx-vehicle-server/pom.xml

@@ -29,6 +29,7 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>

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

@@ -51,7 +51,7 @@ public class VehicleLicenseController extends VehicleBaseController<VehicleLicen
         return RestResponse.suc(baseBiz.getAllByUserid( page,limit,userDTO.getUserid()));
     }
     @RequestMapping(value = "/license/one", method = RequestMethod.GET)
-    public RestResponse one(
+    public RestResponse<VehicleUserLicense> one(
             @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception {
         AppUserDTO userDTO =getUserInfo();
         if(userDTO==null||id==0){

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

@@ -66,7 +66,7 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
-        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id	58	left join branch_company bc on v.`subordinate_branch` = bc.id
+        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         where
         v.is_del=0

xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/platform/vehicle/RegionTest.java

@@ -60,6 +60,8 @@ public class RegionTest {
     public class NewData{
         Long id;
         String name;
+        String lat;
+        String lon;
     }
 
     @Data
@@ -132,34 +134,34 @@ public class RegionTest {
         System.out.println("test");
     }
 
-    @Test
-    public  void test1() {
-        int i = DateTime.now().getMinuteOfDay() / 5;
-        System.out.println("DateTime.now().getMinuteOfDay() / 5++++++++++++"+i);
-        String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +i;//同一日每5分钟只刷新一次
-        System.out.println("redisLockKey++++++++++++++++"+redisLockKey);
-        String s = String.valueOf(DateTime.now().getMillis());
-        System.out.println("s++++++++++++++++++"+s);
-        Boolean suc = customRedisTemplate.opsForValue().setIfAbsent(redisLockKey, s);
-        Boolean test1 = customRedisTemplate.opsForValue().setIfAbsent("1", "2");
-        Boolean test2 = customRedisTemplate.opsForValue().setIfAbsent("1", "3");
-        System.out.println("test1///////////////////////////////"+test1);
-        System.out.println("test2///////////////////////////////"+test2);
-        System.out.println("suc++++++++++++++++++++"+suc);
-    }
-
-    @Test
-    public  void testRedis() {
-        SysRegion sysRegion = getSysRegion(1);
-        System.out.println("sysRegion+++++++++"+sysRegion);
-        System.out.println("TEST_REDIS_KEY+++++++++++" + TEST_REDIS_KEY);
-    }
-
-    @Cache(key = TEST_REDIS_KEY)
-    private SysRegion getSysRegion(int id){
-        SysRegion sysRegion = sysRegionBiz.selectById(2);
-        return sysRegion;
-    }
+//    @Test
+//    public  void test1() {
+//        int i = DateTime.now().getMinuteOfDay() / 5;
+//        System.out.println("DateTime.now().getMinuteOfDay() / 5++++++++++++"+i);
+//        String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +i;//同一日每5分钟只刷新一次
+//        System.out.println("redisLockKey++++++++++++++++"+redisLockKey);
+//        String s = String.valueOf(DateTime.now().getMillis());
+//        System.out.println("s++++++++++++++++++"+s);
+//        Boolean suc = customRedisTemplate.opsForValue().setIfAbsent(redisLockKey, s);
+//        Boolean test1 = customRedisTemplate.opsForValue().setIfAbsent("1", "2");
+//        Boolean test2 = customRedisTemplate.opsForValue().setIfAbsent("1", "3");
+//        System.out.println("test1///////////////////////////////"+test1);
+//        System.out.println("test2///////////////////////////////"+test2);
+//        System.out.println("suc++++++++++++++++++++"+suc);
+//    }
+//
+//    @Test
+//    public  void testRedis() {
+//        SysRegion sysRegion = getSysRegion(1);
+//        System.out.println("sysRegion+++++++++"+sysRegion);
+//        System.out.println("TEST_REDIS_KEY+++++++++++" + TEST_REDIS_KEY);
+//    }
+//
+//    @Cache(key = TEST_REDIS_KEY)
+//    private SysRegion getSysRegion(int id){
+//        SysRegion sysRegion = sysRegionBiz.selectById(2);
+//        return sysRegion;
+//    }
 
 
      @Test