Commit e7ec6f1a authored by hezhen's avatar hezhen

修改

parent 76cd062d
...@@ -10,16 +10,17 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -10,16 +10,17 @@ import org.springframework.beans.factory.annotation.Autowired;
@Slf4j @Slf4j
public class TourBaseController<Biz extends BaseBiz> extends CommonBaseController { public class TourBaseController<Biz extends BaseBiz> extends CommonBaseController {
@Autowired
protected Biz baseBiz;
@Autowired
protected UserFeign userFeign;
@Autowired
protected UserAuthConfig userAuthConfig;
public AppUserDTO getUserInfo(){
// @Autowired return userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
// protected UserFeign userFeign; }
// @Autowired
// protected UserAuthConfig userAuthConfig;
//
// public AppUserDTO getUserInfo(){
// return userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
// }
} }
...@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.*;
public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> { public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
//
// //获取价格 //获取价格
// @RequestMapping(value = "/user/prices", method = RequestMethod.POST) @RequestMapping(value = "/user/prices", method = RequestMethod.POST)
// public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDTO priceDto) { public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDTO priceDto) {
// return baseBiz.getPricesByuserid(priceDto); return baseBiz.getPricesByuserid(priceDto);
// } }
//
// //减库存 //减库存
// @RequestMapping(value = "/stock", method = RequestMethod.GET) @RequestMapping(value = "/stock", method = RequestMethod.GET)
// public ObjectRestResponse<TourSpePriceVo> stock( public ObjectRestResponse<TourSpePriceVo> stock(
// @RequestParam(value = "speId",defaultValue = "0")Integer speId, @RequestParam(value = "speId",defaultValue = "0")Integer speId,
// @RequestParam(value = "number",defaultValue = "0") Integer number){ @RequestParam(value = "number",defaultValue = "0") Integer number){
// return baseBiz.cutStock(speId,number); return baseBiz.cutStock(speId,number);
// } }
} }
\ No newline at end of file
package com.xxfc.platform.tour.rest; 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.msg.ListRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.tour.biz.TourUserBiz; import com.xxfc.platform.tour.biz.TourUserBiz;
import com.xxfc.platform.tour.common.TourBaseController; import com.xxfc.platform.tour.common.TourBaseController;
import com.xxfc.platform.tour.entity.TourUser; 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.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -17,15 +16,12 @@ import java.util.List; ...@@ -17,15 +16,12 @@ import java.util.List;
@RequestMapping("tourUser") @RequestMapping("tourUser")
public class TourUserController extends TourBaseController<TourUserBiz> { public class TourUserController extends TourBaseController<TourUserBiz> {
@Autowired
private TourUserBiz userBiz;
@GetMapping("/app/unauth/getTourUser/{isChild}") @GetMapping("/app/unauth/getTourUser/{isChild}")
public ListRestResponse getTourUser(@PathVariable int isChild){ public ListRestResponse getTourUser(@PathVariable int isChild){
// AppUserDTO userInfo = getUserInfo(); AppUserDTO userInfo = getUserInfo();
// Integer id = userInfo.getId(); Integer id = userInfo.getId();
Integer id =14; List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
List<TourUser> tourUsers= userBiz.getTourUser(id,isChild);
return new ListRestResponse().result(tourUsers).count(tourUsers.size()); return new ListRestResponse().result(tourUsers).count(tourUsers.size());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment