Merge branch 'hz_dev' into base-modify

ace-common/src/main/resources/properties/resultcod.properties

@@ -214,7 +214,7 @@ BOOKED_FAILED_CODE = 4007
 4007=车辆预定失败，请重试！
 
 ONLY_BOOK_FROM_TODAY = 4008
-4008=取消或预定时间不能小于当前时间
+4008=预定时间不能小于当前时间
 
 ADD_VEHICLE_FAIL = 4009
 4009 = 添加车辆失败，请重试
@@ -226,7 +226,7 @@ DATE_TIME_IS_NULL = 4011
 4011 = 预定时间不能为空
 
 ONLY_BOOK_TWO_MONTH = 4012
-4012 = 只能预定两月内的车辆
+4012 = 最多提前三个月预约
 
 ONLY_UNBOOK_TWO_MONTH = 4013
 4013 = 只能取消预定两月内的车辆

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

@@ -121,6 +121,9 @@ public class UserController extends CommonBaseController {
     @RequestMapping(value = "/front/menus", method = RequestMethod.GET)
     public @ResponseBody
     List<MenuTree> getMenusByUsername(String token,String state) throws Exception {
+        if (StringUtils.isBlank(state)){
+            state="0,1";
+        }
         return permissionService.getMenusByUsername(token,state);
     }
 

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

@@ -177,7 +177,7 @@ public class PermissionService {
         }
         User user = userBiz.getUserByUsername(username);
         List<Menu> menus = menuBiz.getUserAuthorityMenuByUserId(user.getId());
-        menus=menus.stream().filter(a->state.contains(a.getState())).collect(Collectors.toList());
+        menus=menus.stream().filter(a->state.contains(a.getState()==null?"1":a.getState())).collect(Collectors.toList());
         return getMenuTree(menus,AdminCommonConstant.ROOT);
     }
 }

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

@@ -106,6 +106,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
             AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
             if (appUserLogin != null) {
                 dto.setUserId(appUserLogin.getId());
+            }else {
+                return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
         UserDTO userDTO = getAdminUserInfo();

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -212,6 +212,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         PageDataVO<SummitActivityVo> dataVO = new PageDataVO<>();
 
         Example example = new Example(SummitActivity.class);
+        example.setOrderByClause("rank ASC ,start_time DESC");
         Example.Criteria criteria = example.createCriteria();
         //未删除
         criteria.andEqualTo("isDel", 0);

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

@@ -61,6 +61,14 @@ public class UploadController{
         return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix));
     }
 
+    @RequestMapping(value = "/app/unauth/uploadVideo", method = RequestMethod.POST)
+    public JSONObject uploadVideo(
+            @RequestParam("file") MultipartFile file,
+            @RequestParam(value = "prefix",defaultValue = "app")String prefix
+    )throws Exception {
+        return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix));
+    }
+
     @RequestMapping(value = "/app/unauth/admin/upload", method = RequestMethod.POST)
     public JSONObject uploads(
             @RequestParam("file") MultipartFile file,

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

@@ -31,7 +31,7 @@ public enum ResCode {
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
     VEHICLE_DEPARTURE_VEHICLE_DELETE(104007,"车辆已下架"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
-    VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"车辆不在出车范围内，请按照预定日期出车！"),
+    VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"请按照预定的日期出车！"),
 
     VEHICLE_BOOK_RECORD_IS_NOT_EXIST(104004, "预约记录不存在"),
     VEHICLE_UNBOOK_FAIL(104005, "取消预定失败！"),