diff --git a/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java b/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java index ce0767c..8c49abf 100644 --- a/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java @@ -23,6 +23,7 @@ import java.util.Date; @JsonIgnoreProperties(ignoreUnknown = true) public class BeanConsumeCartDTO implements Serializable { private Integer id; + private Integer roleId; private String nickname; // 姓名 private Integer jwcode; // 精网号 // private Integer productId; // 产品 ID diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index bc4d7d4..25a3faf 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -197,7 +197,13 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { //筛选查询小黄车消费 @Override public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO) { - + String channel=roleMapper.getChannel(beanConsumeCartDTO.getRoleId()); + if (channel==null){ + return "角色频道有误"; + } + if (!channel.equals("全部")){ + beanConsumeCartDTO.setSourceName(channel); + } PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCartDTO);