Commit 4d54c653 by liyanlin

fix

parent 5c1c6980
...@@ -12,7 +12,7 @@ public interface TimesCardService extends IService<TimesCardType> { ...@@ -12,7 +12,7 @@ public interface TimesCardService extends IService<TimesCardType> {
* *
* @return 次卡list * @return 次卡list
*/ */
List<TimesCardType> getTimesCardTypeList(); List<TimesCardType> getTimesCardTypeList(Integer brandId);
/** /**
* 获取次卡类型聚合 * 获取次卡类型聚合
......
...@@ -22,11 +22,11 @@ public class TimesCardServiceImpl extends ServiceImpl<TimesCardTypeMapper, Times ...@@ -22,11 +22,11 @@ public class TimesCardServiceImpl extends ServiceImpl<TimesCardTypeMapper, Times
private final TimesCardTypeContentMapper timesCardTypeContentMapper; private final TimesCardTypeContentMapper timesCardTypeContentMapper;
private final TimesCardTypeMapper timesCardTypeMapper; private final TimesCardTypeMapper timesCardTypeMapper;
public List<TimesCardType> getTimesCardTypeList() { public List<TimesCardType> getTimesCardTypeList(Integer brandId) {
return timesCardTypeMapper.selectList(new LambdaQueryWrapper<TimesCardType>() return timesCardTypeMapper.selectList(new LambdaQueryWrapper<TimesCardType>()
.eq(TimesCardType::getStatus, TimesCardType.STATUS_ON) .eq(TimesCardType::getStatus, TimesCardType.STATUS_ON)
.eq(TimesCardType::getBrandId, SessionUtils.getCustomerToken().getBrandId())); .eq(TimesCardType::getBrandId, brandId));
} }
public TimesCardType getAggregate(Integer id) { public TimesCardType getAggregate(Integer id) {
......
...@@ -63,8 +63,8 @@ public class TimesCardController { ...@@ -63,8 +63,8 @@ public class TimesCardController {
@ApiOperation(value = "查询次卡种类列表", notes = "查询次卡种类列表") @ApiOperation(value = "查询次卡种类列表", notes = "查询次卡种类列表")
@GetMapping("/customer/timescard/getTimesCardTypeList") @GetMapping("/customer/timescard/getTimesCardTypeList")
public JsonResult<List<TimesCardType>> getTimesCardTypeList() { public JsonResult<List<TimesCardType>> getTimesCardTypeList(@RequestHeader("brandId")Integer brandId) {
return JsonResult.success(timesCardService.getTimesCardTypeList()); return JsonResult.success(timesCardService.getTimesCardTypeList(brandId));
} }
@ApiOperation(value = "查询次卡种类详情") @ApiOperation(value = "查询次卡种类详情")
......
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