|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.qs.mp.admin.domain.excel.ChannelExcel;
|
|
|
import com.qs.mp.admin.domain.excel.UserTicketOrderItemExcel;
|
|
|
+import com.qs.mp.admin.domain.param.ChannelQueryParam;
|
|
|
import com.qs.mp.admin.domain.vo.TicketCntVO;
|
|
|
import com.qs.mp.admin.service.ITicketService;
|
|
|
import com.qs.mp.channel.domain.Channel;
|
|
@@ -101,7 +102,7 @@ public class SaleSiteMgrController extends BaseApiController {
|
|
|
@ApiResponses(
|
|
|
@ApiResponse(code = 200, message = "经销商列表返回信息", response = ChannelVO.class)
|
|
|
)
|
|
|
- public TableDataInfo listSite(@RequestBody Channel channel) {
|
|
|
+ public TableDataInfo listSite(@RequestBody ChannelQueryParam channel) {
|
|
|
List<ChannelVO> list = new ArrayList<ChannelVO>();
|
|
|
startPage();
|
|
|
QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
|
|
@@ -116,6 +117,11 @@ public class SaleSiteMgrController extends BaseApiController {
|
|
|
queryWrapper.eq(null != channel && null != channel.getProvinceId(), "t1.province_id", channel.getProvinceId());
|
|
|
queryWrapper.eq(null != channel && null != channel.getCityId(), "t1.city_id", channel.getCityId());
|
|
|
queryWrapper.eq(null != channel && null != channel.getAreaId(), "t1.area_id", channel.getAreaId());
|
|
|
+
|
|
|
+ if (!CollectionUtils.isEmpty(channel.getExcludeChannelIds())) {
|
|
|
+ queryWrapper.notIn("t1.channel_id", channel.getExcludeChannelIds());
|
|
|
+ }
|
|
|
+
|
|
|
list = channelService.selectSaleSiteList(queryWrapper);
|
|
|
|
|
|
if (null != list && list.size() > 0) {
|