上级渠道为空判断

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelController.java

@@ -57,13 +57,13 @@ public class ChannelController extends BaseApiController {
 
 	@Autowired
 	private IChannelService channelService;
-	
+
 	@Autowired
 	private IChannelCommissionService channelCommissionService;
-	
+
 	@Autowired
 	private IChannelUserRelService channelUserRelService;
-	
+
     @Autowired
     private ISysUserService userService;
 
@@ -170,7 +170,7 @@ public class ChannelController extends BaseApiController {
 		} catch (Exception e) {
 			return AjaxResult.error("渠道'" + channel.getName() + "'新增失败" + e.getMessage());
 		}
-		
+
 		return AjaxResult.success("渠道'" + channel.getName() + "'新增成功");
 	}
 
@@ -243,8 +243,8 @@ public class ChannelController extends BaseApiController {
 		}
 		return AjaxResult.success("渠道'" + channel.getName() + "'编辑成功");
 	}
-	
-	
+
+
 	/**
 	 *获取当前用户渠道或者某个子渠道的经营数据
 	 *
@@ -276,7 +276,7 @@ public class ChannelController extends BaseApiController {
 	    ChannelOperDataVO channelOperDataVO = channelService.getChannelOperData(channel.getChannelNo(), 1);
 		return AjaxResult.success(channelOperDataVO);
 	}
-	
+
 	/**
 	 * 获取子渠道的经营数据列表
 	 *
@@ -294,7 +294,7 @@ public class ChannelController extends BaseApiController {
 		List<Channel> list = channelService.list(
 		        new LambdaQueryWrapper<Channel>().eq(Channel::getParentId, channelId).gt(Channel::getLevel, 0)
 		            .orderByDesc(Channel::getChannelId));
-		
+
 		List<ChannelOperDataVO> dataList = new ArrayList<ChannelOperDataVO>();
 		if(null != list && list.size() > 0) {
 			for(Channel channel : list) {
@@ -310,8 +310,8 @@ public class ChannelController extends BaseApiController {
 		}
 		return getDataTable(dataList);
 	}
-	
-	
+
+
 	/**
 	 * 获取我的经销商列表信息，支持翻页
 	 *
@@ -424,7 +424,7 @@ public class ChannelController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		Channel channel = mapperFacade.map(channelParam, Channel.class);
-		
+
 		// 1、校验修改子渠道是否为当前用户的子渠道
 		Channel oldChannel = channelService.getById(channel.getChannelId());
 		if(null == oldChannel || null == oldChannel.getChannelId()) {
@@ -436,7 +436,7 @@ public class ChannelController extends BaseApiController {
 		}
 		// 2.校验名称是否重复、手机号是否存在（渠道表）；
 		if(!channel.getName().equals(oldChannel.getName())) {
-			
+
 			LambdaQueryWrapper<Channel> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(Channel::getName, channel.getName());
 			queryWrapper.eq(Channel::getLevel, 0);
@@ -471,8 +471,8 @@ public class ChannelController extends BaseApiController {
 		}
 		return AjaxResult.success("经销商'" + channel.getName() + "'编辑成功");
 	}
-	
-	
+
+
 	/**
 	 * 经销商认证审核
 	 * @param
@@ -485,7 +485,7 @@ public class ChannelController extends BaseApiController {
 		if (null == channel || null == channel.getChannelId() || null == channel.getVerifyStatus()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		
+
 		Long parentlId = SecurityUtils.getLoginUser().getChannelId();
 		Channel queryChannel = channelService.getById(channel.getChannelId());
 		if(null == queryChannel || null == queryChannel.getChannelId()) {
@@ -506,7 +506,7 @@ public class ChannelController extends BaseApiController {
 		}
 		return AjaxResult.success("经销商'" + channel.getName() + "'认证审核成功");
 	}
-	
+
 	/**
 	 * 经销商认证页面点提交
 	 * @param
@@ -528,8 +528,8 @@ public class ChannelController extends BaseApiController {
 		}
 		return AjaxResult.success("经销商'" + channel.getName() + "'提交认证信息成功");
 	}
-	
-	
+
+
 	/**
 	 * 我的（经销商）
 	 *
@@ -551,7 +551,7 @@ public class ChannelController extends BaseApiController {
 	    channelVO.setParentName(parentChannel.getName());
 		return AjaxResult.success(channelVO);
 	}
-	
+
 	/**
 	 * 我的（渠道）
 	 *
@@ -567,13 +567,15 @@ public class ChannelController extends BaseApiController {
 		}
 		ChannelVO channelVO = new ChannelVO();
 		Channel queryChannel = channelService.getById(channelId);
-	    BeanUtils.copyProperties(queryChannel, channelVO);
-	    // 查询今日的销售额、佣金收入、新增用户数
-	    Channel parentChannel = channelService.getById(queryChannel.getParentId());
-	    channelVO.setParentName(parentChannel.getName());
-	    // 统计今天的分润金额
-        Date zero = DateUtils.getNowZero(); // 获取当天零点零分时间
-	    QueryWrapper<ChannelCommission> queryWrapper = new QueryWrapper<ChannelCommission>();
+		BeanUtils.copyProperties(queryChannel, channelVO);
+		// 查询今日的销售额、佣金收入、新增用户数
+		Channel parentChannel = channelService.getById(queryChannel.getParentId());
+		if (null != parentChannel) {
+			channelVO.setParentName(parentChannel.getName());
+		}
+		// 统计今天的分润金额
+			Date zero = DateUtils.getNowZero(); // 获取当天零点零分时间
+		QueryWrapper<ChannelCommission> queryWrapper = new QueryWrapper<ChannelCommission>();
 		queryWrapper.select("IFNULL(sum(comm_amt) ,0) as commAmt");
 		queryWrapper.lambda().eq(ChannelCommission::getChannelId, channelId);
 		queryWrapper.lambda().gt(ChannelCommission::getCreatedTime, zero);

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -84,7 +84,7 @@ public class ChannelTicketController extends BaseApiController {
     TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
     TicketBoxVO ticketBoxVO = mapperFacade.map(ticketBox, TicketBoxVO.class);
     ticketBoxVO.setPrizeList(ticketAwardsPrizeService.listPrizeVO(new QueryWrapper<TicketAwardsPrize>()
-        .eq("t1.box_id", ticketBox.getBoxId()).orderByAsc("t1.sort")));
+        .eq("t1.box_id", ticketBox.getBoxId()).orderByAsc("t1.sort").orderByDesc("t2.value")));
     return AjaxResult.success(ticketBoxVO);
   }