chunping 3 жил өмнө
parent
commit
6a61cd34fe

+ 17 - 17
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelMgrController.java

@@ -47,13 +47,13 @@ public class ChannelMgrController extends BaseApiController {
 
 	@Autowired
 	private IChannelService channelService;
-
+	
 	@Autowired
 	private IChannelUserRelService channelUserRelService;
-
+	
 	@Autowired
 	private ISysUserService userService;
-
+	
 	@Autowired
 	private MapperFacade mapperFacade;
 
@@ -90,8 +90,8 @@ public class ChannelMgrController extends BaseApiController {
 		}
 		return AjaxResult.success(list);
 	}
-
-
+	
+	
 	/**
 	 * 查询所有渠道列表
 	 *
@@ -106,8 +106,8 @@ public class ChannelMgrController extends BaseApiController {
 		list = channelService.list(queryWrapper);
 		return AjaxResult.success(list);
 	}
-
-
+	
+	
 	/**
 	 * 获取我的下级渠道列表信息,支持翻页
 	 *
@@ -141,8 +141,8 @@ public class ChannelMgrController extends BaseApiController {
 		}
 		return getDataTable(list);
 	}
-
-
+	
+	
 	/**
 	 * 新增子渠道信息
 	 * @param
@@ -172,7 +172,7 @@ public class ChannelMgrController extends BaseApiController {
 		if(null != channel.getParentId() && channel.getParentId() != 0) {
 			Channel parentChannel = channelService.getById(channel.getParentId());
 			if(null != parentChannel) {
-				 if(null != parentChannel.getCommRate()
+				 if(null != parentChannel.getCommRate() 
 						 && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
 					 return AjaxResult.error("佣金比例不能高于父渠道的佣金比例");
 				 }
@@ -181,18 +181,18 @@ public class ChannelMgrController extends BaseApiController {
 			}else {
 				return AjaxResult.error("父渠道不存在");
 			}
-
+			
 		}else {
 			channel.setLevel(1);
 			channel.setChannelNo("");
 		}
 		// 3.插入数据
 		try {
-			channelService.saveChannel(channel, ChannelRoleEnum.CHANNEL);
+			channelService.saveChannel(channel,ChannelRoleEnum.CHANNEL);
 		} catch (Exception e) {
 			return AjaxResult.error("渠道'" + channel.getName() + "'新增失败" + e.getMessage());
 		}
-
+		
 		return AjaxResult.success("渠道'" + channel.getName() + "'新增成功");
 	}
 
@@ -238,7 +238,7 @@ public class ChannelMgrController extends BaseApiController {
 		// 3.校验佣金比例,不能高于其父渠道的佣金比例,不能低于其子渠道的最大佣金比例
 		Channel parentChannel = channelService.getById(oldChannel.getParentId());
 		if(null != parentChannel) {
-			 if(null != parentChannel.getCommRate()
+			 if(null != parentChannel.getCommRate() 
 					 && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
 				 return AjaxResult.error("佣金比例不能高于父渠道的佣金比例");
 			 }
@@ -265,8 +265,8 @@ public class ChannelMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("渠道'" + channel.getName() + "'编辑成功");
 	}
-
-
+	
+	
 	/**
 	 * 停用、启用渠道
 	 * @param
@@ -296,5 +296,5 @@ public class ChannelMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("操作成功");
 	}
-
+	
 }

+ 13 - 13
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -47,13 +47,13 @@ public class CouponMgrController extends BaseApiController {
 
 	@Autowired
 	private IChannelService channelService;
-
+	
 	@Autowired
 	private IChannelUserRelService channelUserRelService;
-
+	
 	@Autowired
 	private ISysUserService userService;
-
+	
 	@Autowired
 	private MapperFacade mapperFacade;
 
@@ -90,8 +90,8 @@ public class CouponMgrController extends BaseApiController {
 		}
 		return getDataTable(list);
 	}
-
-
+	
+	
 	/**
 	 * 新增子渠道信息
 	 * @param
@@ -121,7 +121,7 @@ public class CouponMgrController extends BaseApiController {
 		if(null != channel.getParentId() && channel.getParentId() != 0) {
 			Channel parentChannel = channelService.getById(channel.getParentId());
 			if(null != parentChannel) {
-				 if(null != parentChannel.getCommRate()
+				 if(null != parentChannel.getCommRate() 
 						 && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
 					 return AjaxResult.error("佣金比例不能高于父渠道的佣金比例");
 				 }
@@ -130,18 +130,18 @@ public class CouponMgrController extends BaseApiController {
 			}else {
 				return AjaxResult.error("父渠道不存在");
 			}
-
+			
 		}else {
 			channel.setLevel(1);
 			channel.setChannelNo("");
 		}
 		// 3.插入数据
 		try {
-			channelService.saveChannel(channel, ChannelRoleEnum.CHANNEL);
+			channelService.saveChannel(channel,ChannelRoleEnum.CHANNEL);
 		} catch (Exception e) {
 			return AjaxResult.error("渠道'" + channel.getName() + "'新增失败" + e.getMessage());
 		}
-
+		
 		return AjaxResult.success("渠道'" + channel.getName() + "'新增成功");
 	}
 
@@ -187,7 +187,7 @@ public class CouponMgrController extends BaseApiController {
 		// 3.校验佣金比例,不能高于其父渠道的佣金比例,不能低于其子渠道的最大佣金比例
 		Channel parentChannel = channelService.getById(oldChannel.getParentId());
 		if(null != parentChannel) {
-			 if(null != parentChannel.getCommRate()
+			 if(null != parentChannel.getCommRate() 
 					 && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
 				 return AjaxResult.error("佣金比例不能高于父渠道的佣金比例");
 			 }
@@ -214,8 +214,8 @@ public class CouponMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("渠道'" + channel.getName() + "'编辑成功");
 	}
-
-
+	
+	
 	/**
 	 * 停用、启用渠道
 	 * @param
@@ -245,5 +245,5 @@ public class CouponMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("操作成功");
 	}
-
+	
 }

+ 13 - 13
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteMgrController.java

@@ -47,13 +47,13 @@ public class SaleSiteMgrController extends BaseApiController {
 
 	@Autowired
 	private IChannelService channelService;
-
+	
 	@Autowired
 	private IChannelUserRelService channelUserRelService;
-
+	
 	@Autowired
 	private ISysUserService userService;
-
+	
 	@Autowired
 	private MapperFacade mapperFacade;
 
@@ -94,8 +94,8 @@ public class SaleSiteMgrController extends BaseApiController {
 		}
 		return getDataTable(list);
 	}
-
-
+	
+	
 	/**
 	 * 新增经销商信息
 	 * @param
@@ -125,7 +125,7 @@ public class SaleSiteMgrController extends BaseApiController {
 		if(null != channel.getParentId() && channel.getParentId() != 0) {
 			Channel parentChannel = channelService.getById(channel.getParentId());
 			if(null != parentChannel) {
-				 if(null != parentChannel.getCommRate()
+				 if(null != parentChannel.getCommRate() 
 						 && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
 					 return AjaxResult.error("佣金比例不能高于父渠道的佣金比例");
 				 }
@@ -134,18 +134,18 @@ public class SaleSiteMgrController extends BaseApiController {
 			}else {
 				return AjaxResult.error("父渠道不存在");
 			}
-
+			
 		}else {
 			channel.setLevel(1);
 			channel.setChannelNo("");
 		}
 		// 3.插入数据
 		try {
-			channelService.saveChannel(channel, ChannelRoleEnum.SALESITE);
+			channelService.saveChannel(channel,ChannelRoleEnum.SALESITE);
 		} catch (Exception e) {
 			return AjaxResult.error("经销商'" + channel.getName() + "'新增失败" + e.getMessage());
 		}
-
+		
 		return AjaxResult.success("经销商'" + channel.getName() + "'新增成功");
 	}
 
@@ -191,7 +191,7 @@ public class SaleSiteMgrController extends BaseApiController {
 		// 3.校验佣金比例,不能高于其父渠道的佣金比例,不能低于其子渠道的最大佣金比例
 		Channel parentChannel = channelService.getById(oldChannel.getParentId());
 		if(null != parentChannel) {
-			 if(null != parentChannel.getCommRate()
+			 if(null != parentChannel.getCommRate() 
 					 && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
 				 return AjaxResult.error("佣金比例不能高于父渠道的佣金比例");
 			 }
@@ -207,8 +207,8 @@ public class SaleSiteMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("经销商'" + channel.getName() + "'编辑成功");
 	}
-
-
+	
+	
 	/**
 	 * 停用、启用经销商
 	 * @param
@@ -238,5 +238,5 @@ public class SaleSiteMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("操作成功");
 	}
-
+	
 }