Merge branch 'lb_dev' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java

 package com.github.wxiaoqi.security.common.constant;
 
+import java.time.format.DateTimeFormatter;
+
 /**
  * Created by ace on 2017/8/29.
  */
@@ -39,4 +41,8 @@ public class CommonConstants {
     public static final String LONG_TIME = "HHmmss";
     public static final String SHORT_TIME = "HHmm";
     public static final String DATE_TIME_LINE = "yyyy-MM-dd HH:mm:ss";
+
+    public static final DateTimeFormatter DATE_TIME_LINE_FORMATTER = DateTimeFormatter.ofPattern(DATE_TIME_LINE);
+    public static final DateTimeFormatter YMR_SLASH_FORMATTER = DateTimeFormatter.ofPattern(YMR_SLASH);
+
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/CommonLogServiceImpl.java

@@ -88,9 +88,9 @@ public class CommonLogServiceImpl implements CommonLogService {
         }
         @Override
         public void run() {
-            if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
-                log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
-            }
+//            if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
+//                log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
+//            }
             mongoTemplate.insert(xxLogEntity, xxLogEntity.getMongoKey());
         }
     }

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

@@ -77,4 +77,7 @@ public class BaseUserMemberVO implements Serializable {
     @Column(name = "member_name")
     private  String memberName;
 
+
+    private Integer discount;
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseUserMemberController.java

@@ -39,7 +39,7 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
      */
     @ApiOperation(value = "根据用户id获取用户会员信息")
     @GetMapping("/findOne/{userId}")
-    public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId){
+    public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId)throws Exception{
         return  ObjectRestResponse.succ(baseBiz.findOneByUserId(userId));
     }
 

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

@@ -37,7 +37,8 @@
         m.total_number as totalNumber,
         m.buy_count as buyCount,
         m.valid_time as validTime,
-        m.member_name as `memberName`,
+        m.member_name as memberName,
+        m.discount as discount,
         ml.name as name
         from
         base_user_member m
@@ -46,10 +47,9 @@
         on
         m.member_level =ml.level
         where
-         m.user_id=#{userId}
-         and
-         m.is_del=0
-
+        m.user_id=#{userId}
+        and
+        m.is_del=0
         limit 1
     </select>
 

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

+package com.xxfc.platform.campsite.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 公众号
+ * @data 2019/8/22 14:07
+ */
+@Data
+public class CampsiteShopFindDTO extends PageParam {
+
+     private Integer proviceCode;
+
+     private Integer cityCode;
+
+     private Integer type;
+}

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java

 package com.xxfc.platform.campsite.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -7,8 +8,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 
@@ -67,13 +66,6 @@ public class CampsiteShopPageVo implements Serializable {
     @ApiModelProperty(value = "店铺类型名称")
     private String  storeTypeName;
 
-    /**
-     * 店铺类型id
-     */
-    @ApiModelProperty(value = "店铺类型id")
-    private String storeId;
-
-
     /**
      * 经度
      */
@@ -96,6 +88,7 @@ public class CampsiteShopPageVo implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", hidden = true)
+    @JsonIgnore
     private Long crtTime;
 
     @ApiModelProperty(value = "電話")

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopVo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Table;
 import java.io.Serializable;
 
 

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

@@ -59,7 +59,6 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
      */
     private static final String CAMPSITE_LIST_CACHE_PREKEY = "campsite_cache:";
     private static final String CAMSITE_DETAIL_CACHE_PREKEY = "campsite:detail:cache:";
-    private static final String CAMPSITE_CACHE_ALL = "all";
     private static final long CAMPSITE_CACHE_EXPIRE_TIME = 6000;
 
     /**
@@ -79,27 +78,27 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     }
 
 
-    public PageDataVO<CampsiteShopPageVo> findCampsiteShopPageByType(Integer type, Integer pageNo, Integer pageSize) {
-        String result;
-        if (Objects.isNull(type)) {
-            result = campHashOperations.get(CAMPSITE_LIST_CACHE_PREKEY,String.format("%s%d%d",CAMPSITE_CACHE_ALL,pageNo,pageSize));
-        } else {
-            result = campHashOperations.get(CAMPSITE_LIST_CACHE_PREKEY, String.format("%s%d%d", String.valueOf(type), pageNo, pageSize));
-        }
+    public PageDataVO<CampsiteShopPageVo> findCampsiteShopPageByType(CampsiteShopFindDTO campsiteShopFindDTO) {
+        String campsite_cache_key = String.format("%s%s%s%s%s", campsiteShopFindDTO.getType() == null ? "" : campsiteShopFindDTO.getType() + ":",
+                campsiteShopFindDTO.getProviceCode() == null ? "" : campsiteShopFindDTO.getProviceCode() + ":",
+                campsiteShopFindDTO.getCityCode()==null?"":campsiteShopFindDTO.getCityCode()+":",
+                campsiteShopFindDTO.getPage()+":",
+                campsiteShopFindDTO.getLimit());
+        String  result = campHashOperations.get(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key);
         if (result != null) {
             return JSONObject.parseObject(result, new TypeReference<PageDataVO<CampsiteShopPageVo>>() {
             });
         }
         PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = new PageDataVO<>();
 
-        PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findAllCampsiteShopsByType(type));
+        PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(campsiteShopFindDTO.getPage(), campsiteShopFindDTO.getLimit(), () -> mapper.findAllCampsiteShopsByTypeOrCode(campsiteShopFindDTO.getType(),campsiteShopFindDTO.getProviceCode(),campsiteShopFindDTO.getCityCode()));
         List<CampsiteShopPageDTO> campsiteShopPageDTOS = pageDataVO.getData();
         if (CollectionUtils.isEmpty(campsiteShopPageDTOS)) {
-            campsiteShopPageDataVO.setData(new ArrayList<CampsiteShopPageVo>());
+            campsiteShopPageDataVO.setData(Collections.EMPTY_LIST);
             return campsiteShopPageDataVO;
         }
         if (log.isDebugEnabled()) {
-            log.debug("根据type=【{}】查询到的店铺数据：【{}】", type, campsiteShopPageDTOS);
+            log.debug("根据type=【{}】查询到的店铺数据：【{}】", campsiteShopFindDTO.getType(), campsiteShopPageDTOS);
         }
 
         List<CampsiteShopPageVo> campsiteShopPageVoList = new ArrayList<>();
@@ -117,11 +116,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         campsiteShopPageDataVO.setPageNum(pageDataVO.getPageNum());
         campsiteShopPageDataVO.setData(campsiteShopPageVoList);
 
-        if (Objects.isNull(type)) {
-            campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY, String.format("%s%d%d",CAMPSITE_CACHE_ALL,pageNo,pageSize), JSONObject.toJSONString(campsiteShopPageDataVO));
-        } else {
-            campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY, String.format("%s%d%d", String.valueOf(type), pageNo, pageSize), JSONObject.toJSONString(campsiteShopPageDataVO));
-        }
+        campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));
         return campsiteShopPageDataVO;
     }
 
@@ -167,7 +162,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         }
         campsiteShopDetailVo.setTypeNames(shopTagDTOS == null ? Collections.EMPTY_LIST : shopTagDTOS.stream().map(CampsiteShopTagDTO::getName).collect(Collectors.toList()));
         //根据经纬度算距离
-        if (campsiteShopDetailDTO.getLongitude()!=null && campsiteShopDetailDTO.getLatitude()!=null) {
+        if (campsiteShopDetailDTO.getLongitude() != null && campsiteShopDetailDTO.getLatitude() != null) {
             double distance = getDistance(campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude);
             if (log.isDebugEnabled()) {
                 log.debug("根据店铺经度=【{}】,纬度=【{}】和自己所在位置的经度=【{}】,纬度=【{}】计算出的距离：【{}km】", campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude, distance);
@@ -307,7 +302,6 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     }
 
 
-
     public int upperOrLowerShelves(Integer id, Integer status) {
         int effectRows = mapper.updateCampsiteSaleStatusById(id, status);
         if (effectRows > 0) {

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

 package com.xxfc.platform.campsite.biz;
 
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.campsite.dto.CampsiteShopCarouselDTO;
 import com.xxfc.platform.campsite.dto.CampsiteShopCarouselDetailDTO;
+import com.xxfc.platform.campsite.entity.CampsiteShopCarousel;
+import com.xxfc.platform.campsite.mapper.CampsiteShopCarouselMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.campsite.entity.CampsiteShopCarousel;
-import com.xxfc.platform.campsite.mapper.CampsiteShopCarouselMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteShopMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * 营地店铺表
- * 
+ *
  * @author libin
  * @email 18178966185@163.com
  * @date 2019-06-17 10:28:48
@@ -23,12 +23,16 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
 
     /**
      * 根据店铺类型查找店铺列表
+     *
      * @param typeId
      */
-    List<CampsiteShopPageDTO> findAllCampsiteShopsByType(@Param("typeId") Integer typeId);
+    List<CampsiteShopPageDTO> findAllCampsiteShopsByTypeOrCode(@Param("typeId") Integer typeId,
+                                                               @Param("proviceCode") Integer proviceCode,
+                                                               @Param("cityCode") Integer cityCode);
 
     /**
      * 首页营地列表
+     *
      * @param start
      * @param size
      * @return
@@ -37,6 +41,7 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
 
     /**
      * 根据店铺id查询
+     *
      * @param id
      * @return
      */
@@ -44,6 +49,7 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
 
     /**
      * 根据条件查询
+     *
      * @param campsiteShopAdminFindDTO
      * @return
      */
@@ -51,14 +57,16 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
 
     /**
      * 更新店铺的状态
+     *
      * @param id
      * @param status
      * @return
      */
-    int updateCampsiteStatusById(@Param("id") int id,@Param("status") int status);
+    int updateCampsiteStatusById(@Param("id") int id, @Param("status") int status);
 
     /**
      * 更新店铺的上下架状态
+     *
      * @param id
      * @param status
      * @return
@@ -67,9 +75,10 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
 
     /**
      * 检验营地名称
+     *
      * @param id
      * @param name
      * @return
      */
-    int checkNameExist(@Param("id") Integer id,@Param("name") String name);
+    int checkNameExist(@Param("id") Integer id, @Param("name") String name);
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -5,10 +5,10 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.campsite.biz.CampsiteShopBiz;
+import com.xxfc.platform.campsite.dto.CampsiteShopFindDTO;
 import com.xxfc.platform.campsite.entity.CampsiteShop;
 import com.xxfc.platform.campsite.vo.CampsiteShopDetailVo;
 import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
-import com.xxfc.platform.campsite.vo.CampsiteShopVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,10 +32,14 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
 
     @ApiOperation("分页查询营地列表")
     @GetMapping("/app/unauth/shops")
-    public ObjectRestResponse<PageDataVO<CampsiteShopVo>> findCampsiteShopPageByType(@RequestParam(value = "type", required = false) Integer type,
+    public ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsiteShopPageByType(@RequestParam(value = "type", required = false) Integer type,
                                                                                      @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
                                                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "6") Integer pageSize) {
-        PageDataVO<CampsiteShopPageVo> pageDataVO = getBaseBiz().findCampsiteShopPageByType(type, pageNo, pageSize);
+        CampsiteShopFindDTO campsiteShopFindDTO = new CampsiteShopFindDTO();
+        campsiteShopFindDTO.setType(type);
+        campsiteShopFindDTO.setPage(pageNo);
+        campsiteShopFindDTO.setLimit(pageSize);
+        PageDataVO<CampsiteShopPageVo> pageDataVO = getBaseBiz().findCampsiteShopPageByType(campsiteShopFindDTO);
         return ObjectRestResponse.succ(pageDataVO);
     }
 
@@ -59,5 +63,11 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
         return getBaseBiz().getAllByHome(page,limit);
     }
 
+    @GetMapping(value = "/app/unauth/webchat_official/campsites")
+    public ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsitesForPublicNumber(CampsiteShopFindDTO campsiteShopFindDTO){
+
+        PageDataVO<CampsiteShopPageVo> campsiteShops = baseBiz.findCampsiteShopPageByType(campsiteShopFindDTO);
+        return ObjectRestResponse.succ(campsiteShops);
+    }
 
 }
\ No newline at end of file

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

@@ -35,7 +35,7 @@
     </resultMap>
 
     <!--根据类型查询全部-->
-    <select id="findAllCampsiteShopsByType" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
+    <select id="findAllCampsiteShopsByTypeOrCode" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
         select cs.id as `id`,cs.name as `name`,cs.logo as `logo`,cs.url as `url`,cs.province_name as `provinceName`,cs.city_name as `cityName`,cs.service_phone as `phone`,
         cs.longitude as `longitude`,cs.latitude as `latitude`,`address` as `address`,cs.hot as `hot`,cs.crt_time as `crtTime`,ct.id as `storeId`,ct.name as `storeTypeName`
         FROM `campsite_shop_tag`  cst
@@ -44,7 +44,14 @@
         where cs.sale_state=1 and cs.is_del=0
         <if test="typeId!=null">
             and cst.tag_id=#{typeId}
-        </if> order by `crtTime`  DESC
+        </if>
+        <if test="proviceCode != null">
+            and  `province`=#{proviceCode}
+        </if>
+        <if test="cityCode != null">
+            and `city`=#{cityCode}
+        </if>
+         order by `crtTime`  DESC
     </select>
 
     <!--首页查询全部-->

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

@@ -85,7 +85,7 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             //判断是否定损过
             if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
                 crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
-                depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUND;
+                depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUNDARRIVAL;
             }else {
                 crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
                 depositRefundRecordStatus = DepositRefundStatus.REFUNDARRIVAL;

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

@@ -320,6 +320,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
+                //修改訂單狀態為定損
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
                 baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);

xx-order/xx-order-server/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848, 10.1.37.166:8848
         #共用配置，+ mongodb日志配置
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourVerificationInfoVo.java

+package com.xxfc.platform.tour.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 旅游商品
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-06 11:41:51
+ */
+@Data
+public class TourVerificationInfoVo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+
+	@ApiModelProperty("旅游线路核销id")
+    private Integer verificationId;
+	
+
+	@ApiModelProperty(value = "旅游商品规格id")
+    private Integer speId;
+
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+
+	//结束时间
+	@ApiModelProperty(value = "结束时间")
+	private Date endTime;
+
+
+	@ApiModelProperty(value = "时间区间")
+	private String time;
+
+
+	@ApiModelProperty(value = "出发路线id")
+    private Integer siteId;
+
+	@ApiModelProperty(value = "出发路线名称")
+	private String siteName;
+
+	@ApiModelProperty(value = "出发路线分公司id")
+	private Integer companyId;
+	
+
+	@ApiModelProperty(value = "旅游路线id")
+    private Integer goodId;
+
+	@ApiModelProperty(value = "旅游路线名称")
+	private String goodName;
+
+	@ApiModelProperty(value = "出发路线分公司ids")
+	private List<Integer> companyList;
+
+	
+
+}

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

 package com.xxfc.platform.tour.biz;
 
 import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import com.xxfc.platform.tour.vo.TourGoodOrderVo;
+import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
+import org.omg.CORBA.PUBLIC_MEMBER;
 import org.springframework.stereotype.Service;
 import  com.xxfc.platform.tour.entity.TourGoodVerification;
 import  com.xxfc.platform.tour.mapper.TourGoodVerificationMapper;
@@ -90,4 +93,42 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
         TourGoodVerification verfication = mapper.selectByPrimaryKey(tourGoodVerification);
         return verfication.getStatus();
     }
+
+    //获取路线核销id
+    public ObjectRestResponse getVerificationList(TourVerificationInfoVo tourVerificationInfoVo){
+        Integer companyId=tourVerificationInfoVo.getCompanyId();
+        Integer goodId=tourVerificationInfoVo.getGoodId();
+        Integer siteId=tourVerificationInfoVo.getSiteId();
+        List<Integer> companyIds=tourVerificationInfoVo.getCompanyList();
+        List<TourVerificationInfoVo> list=null;
+        if (goodId==null||goodId==0){
+            if (companyId!=null&&companyId!=0){
+                list=mapper.getSiteList(null,companyId,null);
+                if (list.size()==0){
+                    return  ObjectRestResponse.succ();
+                }
+            }else if (companyIds!=null&&companyIds.size()>0){
+                list=mapper.getSiteList(null,null,companyIds);
+            }
+            list=mapper.getGoodList(list);
+        }else {
+            if (siteId==null||siteId==0){
+                if (companyId==null||companyId==0){
+                    list=mapper.getSiteList(goodId,null,companyIds);
+                }else {
+                    list=mapper.getSpeList(goodId,null,companyId);
+                }
+            }else {
+                list= mapper.getSpeList(goodId,siteId,null);
+            }
+
+        }
+        return  ObjectRestResponse.succ(list);
+    }
+    //获取路线核销信息
+    public ObjectRestResponse getVerification(Integer verificationId){
+        return  ObjectRestResponse.succ(mapper.getVerification(verificationId));
+    }
+
+
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

@@ -4,6 +4,7 @@ package com.xxfc.platform.tour.mapper;
 import  com.xxfc.platform.tour.entity.TourGoodVerification;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import com.xxfc.platform.tour.vo.TourGoodOrderVo;
+import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -55,4 +56,16 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
      * @return
      */
     List<TourGoodOrderVo> findVerificationAll(TourGoodOrderFindVo tourGoodOrderFindVo );
+
+    //获取旅游路线
+    List<TourVerificationInfoVo>  getGoodList(@Param("list")List<TourVerificationInfoVo> list);
+
+    //获取路线id列表
+    List<TourVerificationInfoVo>  getSiteList(@Param("goodId")Integer goodId,@Param("companyId")Integer companyId,@Param("companyList")List<Integer> companyIds);
+
+    //获取时间列表
+    List<TourVerificationInfoVo>  getSpeList(@Param("goodId")Integer goodId,@Param("siteId")Integer siteId,@Param("companyId")Integer companyId);
+
+    //获取核销路线信息
+    TourVerificationInfoVo  getVerification(@Param("verificationId")Integer verificationId);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

@@ -5,16 +5,22 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.biz.TourGoodVerificationBiz;
+import com.xxfc.platform.tour.common.TourBaseController;
 import com.xxfc.platform.tour.entity.TourGoodVerification;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import com.xxfc.platform.tour.vo.TourGoodOrderVo;
+import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/tourGood/verfication")
 @IgnoreClientToken
-public class TourGoodVerificationController extends BaseController<TourGoodVerificationBiz, TourGoodVerification> {
+public class TourGoodVerificationController extends TourBaseController<TourGoodVerificationBiz> {
+
+
     /**
      * 查询订单列表
      * @param tourGoodOrderFindVo
@@ -67,4 +73,5 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
     public Integer selectDepartureStatusByVerificationId(@RequestParam(value = "verificationId") Integer verificationId){
         return baseBiz.selectDepartureStatusByVerificationId(verificationId);
     }
+
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourVerificationController.java

+package com.xxfc.platform.tour.rest;
+
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.tour.biz.TourGoodVerificationBiz;
+import com.xxfc.platform.tour.common.TourBaseController;
+import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.tour.vo.TourGoodOrderVo;
+import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
+
+@RestController
+@RequestMapping("/verfication")
+@IgnoreClientToken
+public class TourVerificationController extends TourBaseController<TourGoodVerificationBiz> {
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+    @GetMapping("/getList")
+    public ObjectRestResponse getList(TourVerificationInfoVo tourVerificationInfoVo){
+       Integer companyId=tourVerificationInfoVo.getCompanyId();
+        if (companyId==null){
+            UserDTO userDTO=userinfoByToken();
+            if ( userDTO!=null&&DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
+                List<BranchCompany> companyList= vehicleFeign.companyAll(userDTO.getDataAll(),userDTO.getDataCompany(),userDTO.getDataZone());
+                if (companyList.size()>0){
+                    List<Integer> companyIds = companyList.stream().map(BranchCompany::getId).collect(Collectors.toList());
+                    tourVerificationInfoVo.setCompanyList(companyIds);
+                }
+            }
+        }
+        return baseBiz.getVerificationList(tourVerificationInfoVo);
+    }
+
+    @GetMapping("/info/{id}")
+    public ObjectRestResponse getList(@PathVariable Integer id){
+        return baseBiz.getVerification(id);
+    }
+
+}
\ No newline at end of file

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -38,4 +38,99 @@
         LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
         WHERE s.company_id=#{companyId} and v.status=#{orderStatus} and p.start_time=#{travelDate} ORDER BY s.depart_time ) as `goodOrder`
     </select>
+    <!-- 获取旅游路线id-->
+     <select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+             SELECT
+        v.good_id as goodId,
+        g.`name` as goodName
+    FROM
+        tour_good_verification v
+    LEFT JOIN tour_good g ON v.good_id = g.id
+    WHERE
+        v.is_del = 0
+    <if test="list!=null and list.size != 0">
+             and v.site_id  in (
+             <trim suffixOverrides=",">
+                 <foreach collection="list" item="item">
+                     #{item.siteId},
+                 </foreach>
+             </trim>
+             )
+     </if>
+    GROUP BY
+        v.good_id
+     </select>
+    <!--获取路线id-->
+    <select id="getSiteList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+        SELECT
+        id as siteId,
+        name as siteName,
+        company_id as companyId
+         FROM tour_good_site
+        WHERE  is_del=0
+        and type=0
+        <if test="goodId!=null and goodId!='' ">
+            and good_id=#{goodId}
+        </if>
+        <if test="companyId!=null and companyId!='' ">
+        and company_id=#{companyId}
+        </if>
+        <if test="companyList!=null and companyList.size != 0">
+            and company_id  in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="id">
+                    #{id},
+                </foreach>
+            </trim>
+            )
+        </if>
+        order by  rank desc
+    </select>
+    <!--获取时间-->
+     <select id="getSpeList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+        SELECT
+         DISTINCT
+         v.id as verificationId,
+         v.spe_id as speId,
+         p.start_time as startTime,
+         p.end_time as endTime,
+         CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time
+         FROM
+         tour_good_verification v
+         LEFT JOIN  tour_good_site s   on v.site_id=s.id
+         LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
+         WHERE
+         v.is_del = 0 and v.good_id=#{goodId} and DATEDIFF(p.start_time,NOW())>0
+         <if test="siteId!=null and siteId!='' ">
+             and v.site_id=#{siteId}
+         </if>
+         <if test="companyId!=null and companyId!='' ">
+             and s.company_id=#{companyId}
+         </if>
+          ORDER BY
+            p.start_time
+
+     </select>
+    <!--获取核销信息-->
+    <select id="getVerification" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+        SELECT
+        DISTINCT
+        v.id as verificationId,
+        v.spe_id as speId,
+        p.start_time as startTime,
+        p.end_time as endTime,
+        CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time,
+        s.id as siteId,
+        s.name as siteName,
+        s.company_id as companyId,
+        v.good_id as goodId,
+        g.`name` as goodName
+        FROM
+        tour_good_verification v
+        LEFT JOIN  tour_good_site s   on v.site_id=s.id
+        LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
+        LEFT JOIN  tour_good g ON v.good_id=g.id
+        WHERE v.id=#{verificationId}
+    </select>
+
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -176,7 +176,7 @@ public class VehicleBookRecord {
     private Integer haveViolation;
 
     /**
-     * 订单号
+     * 租车订单号或者旅游路线id
      */
     private String orderNo;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

@@ -4,9 +4,15 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
+
 @Data
 public class RentVehicleBookDTO extends PageParam {
     //根据车型、时间、距离，门店，预定车辆
@@ -57,9 +63,6 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("订单号")
     private String orderNo;
 
-    @ApiModelProperty("停靠公司id")
-    Integer parkBranchCompanyId;
-
     @ApiModelProperty("指定车牌")
     String numberPlate;
 
@@ -71,4 +74,35 @@ public class RentVehicleBookDTO extends PageParam {
      */
     @ApiModelProperty("随车物品id以及数量 List<Map<id,数量>>")
     Map<Integer,Integer> selectedAccItem;
+
+    @ApiModelProperty("停靠公司id")
+    Integer parkBranchCompanyId;
+
+    @ApiModelProperty("开始公司id")
+    Integer startCompanyId;
+
+    @ApiModelProperty("结束公司id")
+    Integer endCompanyId;
+
+    @ApiModelProperty("扩展开始时间")
+    String startDateExtend;
+
+    @ApiModelProperty("扩展结束时间")
+    String endDateExtend;
+
+    public void setBookStartDate(String bookStartDate) {
+        this.bookStartDate = bookStartDate;
+        //首次设置
+        if(null == this.startDateExtend) {
+            this.startDateExtend = YMR_SLASH_FORMATTER.format(LocalDateTime.parse(bookStartDate, YMR_SLASH_FORMATTER).minusDays(1L));
+        }
+    }
+
+    public void setBookEndDate(String bookEndDate) {
+        this.bookEndDate = bookEndDate;
+        //首次设置
+        if(null == this.endDateExtend) {
+            this.endDateExtend = YMR_SLASH_FORMATTER.format(LocalDateTime.parse(bookEndDate, YMR_SLASH_FORMATTER).plusDays(1L));
+        }
+    }
 }
\ No newline at end of file

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

@@ -510,9 +510,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Integer andOperationFactor = andOpratorParam.get("andOperationFactor");
         Integer andOperationRs = andOpratorParam.get("andOperationRs");
         if(vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null &&
-                ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){
+                ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
             //当天已经被预定检查小时是否也被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
+        } else if ((vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
+            return filterHourInfoBooked(vehicleId, hourInfo);
         }
         return Boolean.TRUE;
     }
@@ -787,13 +789,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 stringBuilder.append("保养");
                 break;
         }
-//        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-//        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-//            stringBuilder.append("中，使用人：");
-//            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-//            stringBuilder.append(" 使用人电话：");
-//            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
-//        }
+        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+            stringBuilder.append("中，使用人：");
+            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+            stringBuilder.append(" 使用人电话：");
+            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+        }
         return stringBuilder.toString();
     }
 
@@ -907,7 +909,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                    if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
                        if(!flag) { //解决重复执行的问题
                            Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
-                           if (effected < 0) {
+                           if (effected < 1) {
                                return Boolean.FALSE;
                            }
                            flag = true;
@@ -1158,8 +1160,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getStartDate())&&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
-                    dto.getEndDate());
+//            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
+//                    dto.getEndDate());
+            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                    dto.getEndDateExtend());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）
@@ -1185,8 +1189,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getBookEndDate())&&
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
-            notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
-                    dto.getBookEndDate());
+//            notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
+//                    dto.getBookEndDate());
+            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                    dto.getEndDateExtend());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

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

@@ -151,8 +151,8 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
     public static void main(String[] args) throws Exception{
-        int b = 24;
-        Integer a = b & 4;
+
+        Integer a = 7936 & 2047;
         System.out.println(a);
     }
 

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

@@ -163,6 +163,8 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
             dto.setLimit(1);
             dto.setPage(1);
             dto.setParkBranchCompanyId(dto.getLiftCompany());
+            dto.setStartCompanyId(dto.getLiftCompany());
+            dto.setEndCompanyId(dto.getEndCompanyId());
             //查询可车辆信息
             PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
             if (pageDataVO.getData().size() <= 0) {

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

@@ -639,9 +639,9 @@
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test="startCompanyId != null and endCompanyId != null ">
                 and (
-                    (abr.to_lift_company = null or abr.to_lift_company = #{startCompanyId})
+                    (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
                     and
-                    (abr.to_return_company = null or abr.to_return_company = #{endCompanyId})
+                    (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
                 )
             </if>
             <if test=" modelId != null ">