官网旅游*会员等级*分公司排序

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/GwTourController.java

@@ -4,12 +4,17 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.tour.entity.TourTag;
 import com.xxfc.platform.tour.feign.TourFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("app/unauth/tour")
 @Slf4j
@@ -47,8 +52,9 @@ public class GwTourController extends CommonBaseController {
     @GetMapping("/tagList")
     @IgnoreUserToken
     public ObjectRestResponse getTagList(@RequestParam(value = "isHot", defaultValue = "0") Integer isHot) {
-
-        return ObjectRestResponse.succ(tourFeign.tagList(isHot));
+        List<TourTag> tourTags = tourFeign.tagList(isHot);
+        tourTags = tourTags.stream().filter(x -> !x.getName().contains("全部")).sorted(Comparator.comparing(TourTag::getRank)).collect(Collectors.toList());
+        return ObjectRestResponse.succ(tourTags);
     }
 
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/MemberLevelController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/17 9:37
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/member_level")
+public class MemberLevelController {
+
+     private final UserFeign userFeign;
+     @GetMapping("/list")
+     public ObjectRestResponse<BaseUserMemberLevel> listMemberLevels(){
+          List<BaseUserMemberLevel> levels = userFeign.levels();
+          return ObjectRestResponse.succ(levels);
+     }
+}

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

@@ -91,6 +91,6 @@
         <if test="cityCode != null">
            AND  `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bc.company_base_id
+        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY `id`
     </select>
 </mapper>
\ No newline at end of file