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

# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodSpeController.java

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java

@@ -10,13 +10,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 @Slf4j
 public class TourBaseController<Biz extends BaseBiz> extends CommonBaseController {
-
-
+    
+    @Autowired
+    protected Biz baseBiz;
     @Autowired
     protected UserFeign userFeign;
     @Autowired
     protected UserAuthConfig userAuthConfig;
 
+
   public AppUserDTO getUserInfo(){
       return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
   }

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

@@ -15,7 +15,8 @@ public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
 
 
 
-    //获取价格
+
+     //获取价格
     @RequestMapping(value = "/user/prices", method = RequestMethod.POST)
     public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDTO priceDto) {
         return baseBiz.getPricesByuserid(priceDto);

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

@@ -7,17 +7,13 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.tour.biz.TourTagBiz;
-import com.xxfc.platform.tour.entity.TourBanner;
 import com.xxfc.platform.tour.entity.TourTag;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
-import org.beetl.core.om.ArrayAA;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("tourTag")

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

 package com.xxfc.platform.tour.rest;
 
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ListRestResponse;
-import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourUserBiz;
 import com.xxfc.platform.tour.common.TourBaseController;
 import com.xxfc.platform.tour.entity.TourUser;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,15 +16,12 @@ import java.util.List;
 @RequestMapping("tourUser")
 public class TourUserController extends TourBaseController<TourUserBiz> {
 
-    @Autowired
-    private TourUserBiz userBiz;
 
     @GetMapping("/app/unauth/getTourUser/{isChild}")
     public ListRestResponse getTourUser(@PathVariable int isChild){
-//        AppUserDTO userInfo = getUserInfo();
-//        Integer id = userInfo.getId();
-        Integer id =14;
-       List<TourUser> tourUsers= userBiz.getTourUser(id,isChild);
+        AppUserDTO userInfo = getUserInfo();
+        Integer id = userInfo.getId();
+       List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
 
        return new ListRestResponse().result(tourUsers).count(tourUsers.size());
     }