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

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

@@ -20,10 +20,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.app.mapper")
 public class AppApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(AppApplication.class, args);
     }
-
-
 }

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

@@ -34,7 +34,8 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
         Banner banner = new Banner();
         banner.setIsDel(0);
         banner.setType(type);
-        return  mapper.selectByExample(banner);
+        //mapper.findByType(type);
+        return  mapper.findBannerListByType(type);
     }
 
 /*

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BannerMapper.java

@@ -21,4 +21,7 @@ public interface BannerMapper extends Mapper<Banner> {
     @Select("select * from `banner` where is_del=#{isDel} order by rank ASC")
     List<Banner> findBannerListByisDelOrderByRank(Banner banner);
 
+
+    @Select("select * from `banner` where `is_del`=0 and `type`=#{type} order by rank asc ")
+    List<Banner> findBannerListByType(Integer type);
 }

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

@@ -49,17 +49,17 @@ public interface TourFeign {
      * @return
      */
     @RequestMapping(value = "/spe/stock", method = RequestMethod.GET)
-    public ObjectRestResponse<TourSpePriceVo> stock(@RequestParam Integer speId, @RequestParam Integer number, @RequestParam Integer type);
+    public ObjectRestResponse<TourSpePriceVo> stock(@RequestParam("speId") Integer speId, @RequestParam("number") Integer number, @RequestParam("type") Integer type);
 
 
     @RequestMapping(value = "/tourGood/app/unauth/usable/{id}", method = RequestMethod.GET)
-    public ObjectRestResponse<TourGood> usableGet(@PathVariable int id);
+    public ObjectRestResponse<TourGood> usableGet(@PathVariable(value = "id") int id);
 
     @GetMapping("/tourUser/app/unauth/getTourUsers")
-    public ObjectRestResponse<List<TourUser>> getTourUsers(@RequestParam  String ids);
+    public ObjectRestResponse<List<TourUser>> getTourUsers(@RequestParam("ids")  String ids);
 
     @GetMapping("/tourGood/verfication/entityList")
-    public ObjectRestResponse<List<TourGoodVerification>> entityList(@RequestParam Map<String, Object> entity);
+    public ObjectRestResponse<List<TourGoodVerification>> entityList(@RequestParam("entity") Map<String, Object> entity);
 
     /**
      * 更新发车状态
@@ -84,7 +84,7 @@ public interface TourFeign {
      * @return
      */
     @GetMapping("/tourGood/verfication/orders")
-    PageDataVO<TourGoodOrderVo> findTourGoodOrders(@RequestParam Map<String,Object> tourGoodOrderFindVo);
+    PageDataVO<TourGoodOrderVo> findTourGoodOrders(@RequestParam("tourGoodOrderFindVo") Map<String,Object> tourGoodOrderFindVo);
 
     @ApiOperation("首页旅游列表")
     @GetMapping(value = "/tourGood/app/shopList")