Merge branch 'dev' into 'master-modify-cutAmount'

# Conflicts:
#   xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#   xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

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

@@ -111,7 +111,7 @@
             <if test="name != null and name != ''">
                and `name` like concat('%',#{name},'%')
             </if>
-        ORDER BY `hot` DESC
+      ORDER BY `hot` DESC
     </select>
 
     <!--根据id更新营地状态-->

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/PushJumpType.java

+package com.xxfc.platform.universal.constant;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 跳转页面类型
+ */
+public enum PushJumpType {
+    ALL(0,"app首页"),
+    VEHICLE_ORDER_DETAIL(1,"租车订单详情页"),
+    TOUR_ORDER_DETAIL(2,"旅游订单详情页"),
+    VEHICLE_ORDER_SCORE(3,"租车订单评价页"),
+    TOUR_ORDER_SCORE(4,"旅游订单评价页面"),
+    MEMBER_ORDER_DETAIL(5,"会员订单详情页"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+
+    private static List<Map<String,Object>> list = new ArrayList<>();
+
+    static{
+        for(PushJumpType pushJumpType : PushJumpType.values()){
+            codeAndDesc.put(pushJumpType.getCode(),pushJumpType.getDesc());
+            Map<String,Object> map=new HashMap<>();
+            map.put("code",pushJumpType.getCode());
+            map.put("value",pushJumpType.getDesc());
+            list.add(map);
+        }
+    }
+
+    PushJumpType(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static String getByCode(Integer code) {
+        switch (code) {
+            case  1:
+                return ALL.getDesc();
+            case  2:
+                return VEHICLE_ORDER_DETAIL.getDesc();
+            case 3:
+                return VEHICLE_ORDER_SCORE.getDesc();
+            case 4:
+                return TOUR_ORDER_SCORE.getDesc();
+            case 5:
+                return MEMBER_ORDER_DETAIL.getDesc();
+        }
+        return "";
+    }
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+    public static List<Map<String,Object>> getList(){
+        return list;
+    }
+
+
+}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/PushSendType.java

+package com.xxfc.platform.universal.constant;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统发送类型
+ */
+public enum PushSendType {
+    ALL(0,"全部"),
+    VEHICLE_PAY(1,"租车预定成功"),
+    TOUR_PAY(2,"旅游预订成功"),
+    VEHICLE_CANCEL(3,"租车取消预订"),
+    TOUR_CANCEL(4,"旅游取消预订"),
+    TAKE_VEHICLE(5,"取车提醒"),
+    ALSO_VEHICLE(6,"还车提醒"),
+    GET_VEHICLE(7,"上车提醒"),
+    VEHICLE_FINISH(8, "租车订单完成"),
+    TOUR_FINISH(9, "旅游订单完成"),
+    MEMBER_PAY(10, "会员购买成功")
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+
+    private static List<Map<String,Object>> list = new ArrayList<>();
+
+    static{
+        for(PushSendType pushSendType : PushSendType.values()){
+            codeAndDesc.put(pushSendType.getCode(),pushSendType.getDesc());
+            Map<String,Object> map=new HashMap<>();
+            map.put("code",pushSendType.getCode());
+            map.put("value",pushSendType.getDesc());
+            list.add(map);
+        }
+    }
+
+    PushSendType(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static String getByCode(Integer code) {
+        return codeAndDesc.get(code);
+    }
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+
+    public static List<Map<String,Object>> getList(){
+        return list;
+    }
+
+}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/MessagePush.java

@@ -64,6 +64,10 @@ public class MessagePush implements Serializable {
 	@ApiModelProperty(value = "指定跳转页面")
     private String intent;
 
+	@Column(name = "jump_type")
+	@ApiModelProperty(value = "跳转页面类型：0-进入app；其他见枚举")
+	private Integer jumpType;
+
 
 	@Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )

xx-universal/xx-universal-server/pom.xml

@@ -89,6 +89,12 @@
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.andrewoma.dexx</groupId>
+            <artifactId>dexx-collections</artifactId>
+            <version>0.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/JPushBiz.java

@@ -20,6 +20,8 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import com.xxfc.platform.universal.constant.PushJumpType;
+import com.xxfc.platform.universal.constant.PushSendType;
 import com.xxfc.platform.universal.entity.MessagePush;
 import com.xxfc.platform.universal.mapper.MessagePushMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -126,10 +131,10 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
 
 
     //推送
-    public ObjectRestResponse jpushToAlias(Integer id,String userIds){
+    public ObjectRestResponse jpushToAlias(Integer id,String userIds,String orderNo){
         ClientConfig clientConfig = ClientConfig.getInstance();
         final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
-        PushPayload payload = buildPushObject_android_id(id,userIds);
+        PushPayload payload = buildPushObject_android_id(id,userIds,orderNo);
         if (payload==null){
             return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"参数无效");
         }
@@ -152,7 +157,7 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
     }
 
 
-    public  PushPayload buildPushObject_android_id(Integer id,String userIds) {
+    public  PushPayload buildPushObject_android_id(Integer id,String userIds,String orderNo) {
         Example example =new Example(MessagePush.class);
         example.createCriteria().andEqualTo("id",id).andEqualTo("isDel",0);
         MessagePush messagePush=mapper.selectOneByExample(example);
@@ -172,6 +177,11 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
         if (StringUtils.isNotBlank(messagePush.getIntent())){
             intent= getJsonObject(messagePush.getIntent());
         }
+        Map<String, String> extras = new HashMap<String, String>();
+        extras.put("onclickType",messagePush.getJumpType()+"");
+        if (StringUtils.isNotBlank(orderNo)){
+        extras.put("orderNo",orderNo);
+        }
         Notification notification = Notification.newBuilder()
                 .addPlatformNotification(AndroidNotification.newBuilder()
                         .setAlert(messagePush.getAlert())
@@ -184,6 +194,7 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
                         .setTitle(messagePush.getTitle())
                         .setPriority(1)
                         .setIntent(intent)
+                        .addExtras(extras)
                         .build())
                 .build();
         return PushPayload.newBuilder()
@@ -216,7 +227,9 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
     }
 
     //删除推送内容
-    public  ObjectRestResponse delMessagePush(MessagePush messagePush){
+    public  ObjectRestResponse delMessagePush(Integer id){
+        MessagePush messagePush=new MessagePush();
+        messagePush.setId(id);
         messagePush.setIsDel(1);
         updateSelectiveById(messagePush);
         return  ObjectRestResponse.succ();
@@ -236,6 +249,16 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
         return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.selectByExample(example)));
     }
 
+    //获取枚举列表
+    public  List<Map<String,Object>> getSendTypes(){
+        return PushSendType.getList();
+    }
+    //获取枚举列表
+    public List<Map<String,Object>> getJumpTypes(){
+        return PushJumpType.getList();
+    }
+
+
 
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/JPushController.java

@@ -36,8 +36,9 @@ public class JPushController {
 
     @RequestMapping(value = "/stype", method = RequestMethod.GET)
     public ObjectRestResponse stype(@RequestParam(value = "id",defaultValue = "0") Integer id,
-                                   @RequestParam(value = "userIds",defaultValue = "") String userIds) throws Exception {
-        return jPushBiz.jpushToAlias(id,userIds);
+                                   @RequestParam(value = "userIds",defaultValue = "") String userIds,
+                                    @RequestParam(value = "orderNo",defaultValue = "") String orderNo) throws Exception {
+        return jPushBiz.jpushToAlias(id,userIds,orderNo);
     }
 
     @RequestMapping(value = "/addMessagePush", method = RequestMethod.POST)
@@ -51,9 +52,9 @@ public class JPushController {
     }
 
 
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    public ObjectRestResponse delMessagePush(@RequestBody MessagePush messagePush){
-        return jPushBiz.delMessagePush(messagePush);
+    @RequestMapping(value = "/del/{id}", method = RequestMethod.DELETE)
+    public ObjectRestResponse delMessagePush(@PathVariable Integer id){
+        return jPushBiz.delMessagePush(id);
     }
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public ObjectRestResponse getList(@RequestParam(value = "page",defaultValue = "1") Integer page,
@@ -63,6 +64,22 @@ public class JPushController {
         return jPushBiz.getList(page,limit,title,type);
     }
 
+    @RequestMapping(value = "/getOne/{id}", method = RequestMethod.GET)
+    public ObjectRestResponse getOne(@PathVariable Integer id){
+        return ObjectRestResponse.succ(jPushBiz.selectById(id));
+    }
+
+    @RequestMapping(value = "/sendTpyes", method = RequestMethod.GET)
+    public ObjectRestResponse sendTpyes(){
+        return ObjectRestResponse.succ(jPushBiz.getSendTypes());
+    }
+    @RequestMapping(value = "/jumpTpyes", method = RequestMethod.GET)
+    public ObjectRestResponse jumpTpyes(){
+        return ObjectRestResponse.succ(jPushBiz.getJumpTypes());
+    }
+
+
+
 
 
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/BookType.java

@@ -58,29 +58,7 @@ public enum BookType {
     }
 
     public static String getByCode(Integer code) {
-        switch (code) {
-            case  2:
-                return EMPLOYEE_APPLY.getDesc();
-            case  1:
-                return USER_RENT.getDesc();
-            case  3:
-                return REPAIRING.getDesc();
-            case  4:
-                return SHOW.getDesc();
-            case  5:
-                return TOUR.getDesc();
-            case  6:
-                return MAINTAIN.getDesc();
-            case  7:
-                return BOOKING.getDesc();
-            case  8:
-                return DISABLE.getDesc();
-            case  9:
-                return CUSTOMER_APPLY.getDesc();
-            case 10:
-                return OTHER.getDesc();
-        }
-        return "";
+        return codeAndDesc.get(code);
     }
     public static Boolean exists(Integer code){
         return codeAndDesc.containsKey(code);

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

@@ -449,7 +449,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         DateTime endDay = DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate, DateTime.parse(startDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER), DateTime.parse(endDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER));
-        if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
+               if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
 
@@ -643,7 +643,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (vehicleBookRecord == null) {
             return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
         }
-        //已通过审核的可以取消预定
+//        //已通过审核的可以取消预定
 //        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
 //            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
 //        }

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

@@ -32,17 +32,17 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate,code, time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,time));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, String time, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
         if (companyList == null || companyList.size() == 0) {
             companyList = Arrays.asList(-1);
         }
-        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate, time, companyList));
+        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,time, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

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

@@ -53,6 +53,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
+
             return ObjectRestResponse.succ(mPageDataVO);
         } catch (Exception e) {
             e.printStackTrace();
@@ -127,7 +128,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
                         WeekendSqls.<VehicleModel>custom()
                                 .andEqualTo(VehicleModel::getIsdel, 0)
                                 .andEqualTo(VehicleModel::getHotSign,1)
-                ).orderByDesc("id").build();
+                ).orderByAsc("sort").build();
         List<VehicleModel> vehicleModels = selectByExample(example);
         if (CollectionUtils.isEmpty(vehicleModels)) {
             return null;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -14,9 +14,18 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
     List<VehicleDepartureLog> selectByVehicle(String vehicleId);
-    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,@Param("code") Integer code, @Param("time") String time);
-
-    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,
+                                            @Param("code") Integer code,
+                                            @Param("zoneId") Integer zoneId,
+                                            @Param("departureId") Integer departureId,
+                                            @Param("time") String time);
+
+    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate,
+                                                      @Param("code") Integer code,
+                                                      @Param("zoneId") Integer zoneId,
+                                                      @Param("departureId") Integer departureId,
+                                                      @Param("time") String time,
+                                                      @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);
 

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

@@ -33,8 +33,22 @@ public class VehicleDepartureController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+    /**
+     * @param numberPlate 车牌
+     * @param code        车辆编码
+     * @param time
+     * @param departureId 出发分公司id
+     * @param page
+     * @param limit
+     * @param request
+     * @return
+     */
     @GetMapping("page")
-    public RestResponse page(String numberPlate,@RequestParam(value = "code",required = false) Integer code,String time, Integer page, Integer limit, HttpServletRequest request) {
+    public RestResponse page(String numberPlate,
+                             @RequestParam(value = "code", required = false) Integer code, String time,
+                             @RequestParam(value = "zoneId",required = false) Integer zoneId,
+                             @RequestParam(value = "departureId", required = false) Integer departureId,
+                             Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -43,15 +57,15 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, time, page, limit));
     }
 
     @GetMapping("small/page")
     @IgnoreUserToken
-    public RestResponse pageBySmall(String numberPlate,@RequestParam(value = "code",required = false) Integer code, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
+    public RestResponse pageBySmall(String numberPlate, @RequestParam(value = "code", required = false) Integer code, String time, Integer page, Integer limit, Integer uid, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -60,14 +74,15 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate,time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code,time,page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, time, page, limit));
     }
 
     /**
      * 根据车辆id查询并分页
+     *
      * @param vehicleId
      * @param page
      * @param limit
@@ -97,39 +112,40 @@ public class VehicleDepartureController {
 
     /**
      * 保存
+     *
      * @param vehicleDepartureLog
      * @return
      */
     @PostMapping("/app/save")
-    public ObjectRestResponse save(@RequestBody VehicleDepartureLog vehicleDepartureLog){
+    public ObjectRestResponse save(@RequestBody VehicleDepartureLog vehicleDepartureLog) {
         return vehicleDepartureService.save(vehicleDepartureLog);
     }
 
 
     /**
      * 查询一条
+     *
      * @param vid 车辆id
      * @return
      * @throws Exception
      */
     @GetMapping("/app/findOne/{id}")
-    public  ObjectRestResponse findOne(@PathVariable Integer vid) throws Exception {
-       return vehicleDepartureService.findOne(vid);
+    public ObjectRestResponse findOne(@PathVariable Integer vid) throws Exception {
+        return vehicleDepartureService.findOne(vid);
     }
 
 
     /**
-     *
      * 收车
+     *
      * @param vdl
      * @return
      * @throws Exception
      */
     @PutMapping("/app/collect")
-    public  ObjectRestResponse collect(@RequestBody VehicleDepartureLog vdl) throws Exception {
+    public ObjectRestResponse collect(@RequestBody VehicleDepartureLog vdl) throws Exception {
         return vehicleDepartureService.collect(vdl);
     }
 
 
-
 }

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

@@ -156,6 +156,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return vehicleModelBiz.findVehicleModelPage(vmqc);
     }
 
+
     @GetMapping(value = "/app/unauth/findRandomVehicle")
     @IgnoreUserToken
     @ApiOperation("获取随机车型")
@@ -197,6 +198,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (StringUtils.isBlank(host)) {
             return ObjectRestResponse.createDefaultFail();
         }
+
+
         //设置信息
         vm.setCrtName(uorr.getData().getName());
         vm.setCrtUser(uorr.getData().getId());
@@ -281,7 +284,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                     }
                     vehicleCataBiz.inserts(vcs);
                 }
-
             }
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {

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

@@ -64,6 +64,12 @@
             <if test="code!=null">
                and  vehicle.code=#{code}
             </if>
+            <if test="zoneId!=null">
+             and  bc.zone_id=#{zoneId}
+            </if>
+            <if test="departureId!=null">
+              and  vehicle_departure_log.departure_branch_company_id=#{departureId}
+            </if>
         </trim>
         order by create_time desc
     </select>
@@ -112,6 +118,15 @@
                 or vehicle_departure_log.departure_time is null
                 )
             </if>
+            <if test="code!=null">
+                and  vehicle.code=#{code}
+            </if>
+            <if test="zoneId!=null">
+              and  bc.zone_id=#{zoneId}
+            </if>
+            <if test="departureId!=null">
+                and  vehicle_departure_log.departure_branch_company_id=#{departureId}
+            </if>
         </trim>
         order by create_time desc
     </select>

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

@@ -482,9 +482,6 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
-            <if test="code !=null">
-                and v1.code=#{code}
-            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v1.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -508,9 +505,6 @@
             <if test="status != null">
                 and v2.status = #{status}
             </if>
-            <if test="code !=null">
-                and v2.code=#{code}
-            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v2.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">

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

@@ -53,7 +53,7 @@
             </foreach>
           )
       </if>
-      ORDER BY	vmqc.id ASC
+      ORDER BY	vmqc.sort ASC
   </select>
 
     <update id="updateScoreByModelIdAndavgScore">