渠道经销商管理接口

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

@@ -65,7 +65,7 @@ public class ChannelTreeController extends BaseApiController {
 	public AjaxResult treeChannel(@RequestBody Channel channel) {
 		List<ChannelVO> list = new ArrayList<ChannelVO>();
 		QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("t1.parent_id", null!=channel && null != channel.getChannelId()?channel.getChannelId():0);
+		queryWrapper.eq("t1.parent_id", null!=channel && null != channel.getParentId()?channel.getParentId():0);
 		queryWrapper.gt("t1.level", 0);
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getMobile()), "t1.mobile", channel.getMobile());
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getName()), "t1.name", channel.getName());
@@ -90,6 +90,23 @@ public class ChannelTreeController extends BaseApiController {
 		return AjaxResult.success(list);
 	}
 	
+	
+	/**
+	 * 查询所有渠道列表
+	 *
+	 * @return
+	 */
+	@PostMapping("/listAll")
+	public AjaxResult listAllChannel() {
+		List<Channel> list = new ArrayList<Channel>();
+		LambdaQueryWrapper<Channel> queryWrapper = new LambdaQueryWrapper<Channel>();
+		queryWrapper.gt(Channel::getLevel, 0);
+		queryWrapper.orderByAsc(Channel::getCreatedTime);
+		list = channelService.list(queryWrapper);
+		return AjaxResult.success(list);
+	}
+	
+	
 	/**
 	 * 获取我的下级渠道列表信息，支持翻页
 	 *
@@ -100,7 +117,9 @@ public class ChannelTreeController extends BaseApiController {
 		List<ChannelVO> list = new ArrayList<ChannelVO>();
 		startPage();
 		QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("t1.parent_id", null!=channel && null != channel.getChannelId()?channel.getChannelId():0);
+		if(null!=channel && null != channel.getParentId()) {
+			queryWrapper.eq("t1.parent_id", channel.getParentId());
+		}
 		queryWrapper.gt("t1.level", 0);
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getMobile()), "t1.mobile", channel.getMobile());
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getName()), "t1.name", channel.getName());
@@ -114,8 +133,8 @@ public class ChannelTreeController extends BaseApiController {
 					channelVO.setSiteCnt(siteCnt);
 					channelVO.setUserCnt(userCnt);
 					// 查询用户信息
-					SysUser sysUser = userService.selectUserById(channelVO.getUserId());
-					channelVO.setSysUser(sysUser);
+					// SysUser sysUser = userService.selectUserById(channelVO.getUserId());
+					// channelVO.setSysUser(sysUser);
  				}
 			}
 		}
@@ -262,14 +281,15 @@ public class ChannelTreeController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		try {
+			channelService.lambdaUpdate().set(Channel::getStatus, status).eq(Channel::getChannelId, channelId).update();
 			// 查询渠道信息
-			Channel channel = channelService.getById(channelId);
-			if(null != channel && null != channel.getUserId()) {
-				SysUser sysUser = new SysUser();
-				sysUser.setUserId(channel.getUserId());
-				sysUser.setStatus(status);
-				userService.updateUserStatus(sysUser);
-			}
+//			Channel channel = channelService.getById(channelId);
+//			if(null != channel && null != channel.getUserId()) {
+//				SysUser sysUser = new SysUser();
+//				sysUser.setUserId(channel.getUserId());
+//				sysUser.setStatus(status);
+//				userService.updateUserStatus(sysUser);
+//			}
 		} catch (Exception e) {
 			return AjaxResult.error("操作失败");
 		}

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

@@ -67,8 +67,8 @@ public class SaleSiteController extends BaseApiController {
 		List<ChannelVO> list = new ArrayList<ChannelVO>();
 		startPage();
 		QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
-		if(null!=channel && null != channel.getChannelId()) {
-			queryWrapper.eq("t1.parent_id", channel.getChannelId());
+		if(null!=channel && null != channel.getParentId()) {
+			queryWrapper.eq("t1.parent_id", channel.getParentId());
 		}
 		queryWrapper.eq("t1.level", 0);
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getMobile()), "t1.mobile", channel.getMobile());
@@ -86,8 +86,8 @@ public class SaleSiteController extends BaseApiController {
 					channelVO.setSiteCnt(siteCnt);
 					channelVO.setUserCnt(userCnt);
 					// 查询用户信息
-					SysUser sysUser = userService.selectUserById(channelVO.getUserId());
-					channelVO.setSysUser(sysUser);
+					//SysUser sysUser = userService.selectUserById(channelVO.getUserId());
+					// channelVO.setSysUser(sysUser);
  				}
 			}
 		}
@@ -223,14 +223,15 @@ public class SaleSiteController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		try {
+			channelService.lambdaUpdate().set(Channel::getStatus, status).eq(Channel::getChannelId, channelId).update();
 			// 查询渠道信息
-			Channel channel = channelService.getById(channelId);
-			if(null != channel && null != channel.getUserId()) {
-				SysUser sysUser = new SysUser();
-				sysUser.setUserId(channel.getUserId());
-				sysUser.setStatus(status);
-				userService.updateUserStatus(sysUser);
-			}
+//			Channel channel = channelService.getById(channelId);
+//			if(null != channel && null != channel.getUserId()) {
+//				SysUser sysUser = new SysUser();
+//				sysUser.setUserId(channel.getUserId());
+//				sysUser.setStatus(status);
+//				userService.updateUserStatus(sysUser);
+//			}
 		} catch (Exception e) {
 			return AjaxResult.error("操作失败");
 		}

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelVO.java

@@ -17,5 +17,5 @@ public class ChannelVO extends Channel {
   
   int childCnt;  // 子渠道数量
   ChannelOperDataVO operData;  // 经营数据
-  SysUser sysUser;  // 关联的用户账号信息
+  // SysUser sysUser;  // 关联的用户账号信息
 }

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelCommissionMapper.java

@@ -14,10 +14,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ChannelCommissionMapper extends BaseMapper<ChannelCommission> {
 
 	/**
-	 * 根据渠道No查询渠道的经营数据
+	 * 查询子渠道一定时间范围内的佣金金额 -
 	 * @param channelNo
 	 * @param days
 	 * @return
 	 */
-	public ChannelCommission getChannelCommissionCnt(@Param("channelNo") String channelNo,@Param("days") int days);
+	public int getChannelCommAmtCnt(@Param("channelNo") String channelNo,@Param("days") int days);
+	
+	
+	/**
+	 * 查询子渠道一定时间范围内的销售金额
+	 * @param channelNo
+	 * @param days
+	 * @return
+	 */
+	public int getChannelSaleAmtCnt(@Param("channelNo") String channelNo,@Param("days") int days);
+	
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelCommissionService.java

@@ -1,6 +1,7 @@
 package com.qs.mp.channel.service;
 
 import com.qs.mp.channel.domain.ChannelCommission;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -14,9 +15,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IChannelCommissionService extends IService<ChannelCommission> {
 
 	/**
-	 * 根据渠道No查询渠道的经营数据
+	 * 查询子渠道一定时间范围内的佣金金额 -
+	 * @param channelNo
+	 * @param days
+	 * @return
+	 */
+	public int getChannelCommAmtCnt(String channelNo, int days);
+	
+	
+	/**
+	 * 查询子渠道一定时间范围内的销售金额
 	 * @param channelNo
+	 * @param days
 	 * @return
 	 */
-	public ChannelCommission getChannelCommissionCnt(String channelNo, int days);
+	public int getChannelSaleAmtCnt(String channelNo, int days);
+	
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCommissionServiceImpl.java

@@ -18,7 +18,12 @@ import org.springframework.stereotype.Service;
 public class ChannelCommissionServiceImpl extends ServiceImpl<ChannelCommissionMapper, ChannelCommission> implements IChannelCommissionService {
 
 	@Override
-	public ChannelCommission getChannelCommissionCnt(String channelNo, int days) {
-		return getBaseMapper().getChannelCommissionCnt(channelNo, days == 1?0: (~(days - 1)));
+	public int getChannelCommAmtCnt(String channelNo, int days) {
+		return getBaseMapper().getChannelCommAmtCnt(channelNo, days == 1?0: (~(days - 1)));
+	}
+
+	@Override
+	public int getChannelSaleAmtCnt(String channelNo, int days) {
+		return getBaseMapper().getChannelSaleAmtCnt(channelNo, days == 1?0: (~(days - 1)));
 	}
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -129,11 +129,11 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
 	@Override
 	public ChannelOperDataVO getChannelOperData(String channelNo, int days) {
 		ChannelOperDataVO channelOperData = new ChannelOperDataVO();
-		ChannelCommission channelCommission = channelCommissionService.getChannelCommissionCnt(channelNo, days);
-		if(null != channelCommission) {
-			channelOperData.setSaleAmt(channelCommission.getSaleAmt());
-			channelOperData.setCommAmt(channelCommission.getCommAmt());
-		}
+		// 查询销售金额
+		channelOperData.setSaleAmt(channelCommissionService.getChannelSaleAmtCnt(channelNo, days));
+		// 查询佣金金额
+		channelOperData.setCommAmt(channelCommissionService.getChannelCommAmtCnt(channelNo, days));
+		// 查询新增用户数
 		int newUserCnt = channelUserRelService.getChannelNewUserCnt(channelNo, days);
 		channelOperData.setNewUserCnt(newUserCnt);
 		return channelOperData;

mp-service/src/main/resources/mapper/channel/ChannelCommissionMapper.xml

@@ -22,14 +22,27 @@
         id, channel_id, order_id, ticket_id, sale_amt, sale_comm_rate, sale_comm_amt, comm_rate, comm_amt, created_time, updated_time
     </sql>
     
-    <!-- 查询子渠道信息 -->
-    <select id="getChannelCommissionCnt" resultMap="BaseResultMap">
-		select IFNULL(SUM(t1.sale_amt),0) sale_amt, IFNULL(SUM(t1.comm_amt),0) comm_amt
+    <!-- 查询子渠道一定时间范围内的佣金金额 -->
+    <select id="getChannelCommAmtCnt" resultType="integer">
+		select IFNULL(SUM(t1.comm_amt),0) as commAmt
 		from mp_channel_commission t1
 		left join mp_channel t2 on t1.channel_id = t2.channel_id
 		where t2.channel_no like concat(#{channelNo},'.%')
 		AND t1.created_time between DATE_ADD(CURDATE(),INTERVAL #{days} DAY) and NOW()
 	</select>
     
+    
+    <!-- 查询子渠道一定时间范围内的销售金额 -->
+    <select id="getChannelSaleAmtCnt" resultType="integer">
+		select IFNULL(SUM(t3.sale_amt),0) as saleAmt
+		from (
+			select t1.ticket_id, MIN(t1.sale_amt)
+			from mp_channel_commission t1
+			left join mp_channel t2 on t1.channel_id = t2.channel_id
+			where t2.channel_no like concat(#{channelNo},'.%')
+			AND t1.created_time between DATE_ADD(CURDATE(),INTERVAL #{days} DAY) and NOW()
+			GROUP BY t1.ticket_id
+		) t3
+	</select>
 
 </mapper>

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -46,12 +46,12 @@
 		${ew.customSqlSegment}
 	</select>
 
-	<!-- 查询渠道及其子渠道经销商用户数总和 -->
+	<!-- 查询渠道及其子渠道经销商数总和 -->
     <select id="getChannelSiteCnt" resultType="integer">
         select count(t1.channel_id) as siteCnt
 		from mp_channel t1
 		left join mp_channel t2 on t1.parent_id = t2.channel_id
-		where t1.`level`= 0 and t1.certify_status = 'y'
+		where t1.`level`= 0
 		and t2.channel_no like concat(#{channelNo}, '.%')
     </select>