diff --git a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java index d8f5b5d..c2a163c 100644 --- a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java +++ b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java @@ -525,7 +525,7 @@ public class ChannelController { order.setUsersList(orderList); list.add(order); Statistics statistics=new Statistics(); - statistics.setDiscountPackageList(channelService.getOrderList(channelId,type)); + statistics.setDiscountPackageList(channelService.getOrderList(channelId,agentId,type)); list.add(statistics); result.setData(list); return result; @@ -561,7 +561,7 @@ public class ChannelController { order.setDiscountPackageList(channelService.getOrderDetailList(channelId,agentId,type,0)); list.add(order); Statistics statistics=new Statistics(); - statistics.setDiscountPackageList(channelService.getOrderList(channelId,type)); + statistics.setDiscountPackageList(channelService.getOrderList(channelId,agentId,type)); list.add(statistics); result.setData(list); return result; diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java index d31bf4c..152e5a9 100644 --- a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java +++ b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java @@ -43,7 +43,7 @@ public interface ChannelMapper { Users getChannelOrder(@Param("channelId") int channelId,@Param("type") int type,@Param("state") int state); - List getOrderList(@Param("channelId") int channelId,@Param("type") int type,@Param("state") int state); + List getOrderList(@Param("channelId") int channelId,@Param("agentId") int agentId,@Param("type") int type,@Param("state") int state); List getRegisterDetailList(@Param("channelId") int channelId,@Param("agentId") int agentId,@Param("type") int type); diff --git a/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java b/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java index a415e4d..cabf853 100644 --- a/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java +++ b/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java @@ -38,7 +38,7 @@ public interface ChannelService { Users getChannelOrder(int channelId,int type); - List getOrderList(int channelId,int type); + List getOrderList(int channelId,int agentId,int type); List getRegisterDetailList(int channelId,int agentId,int type); diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java index d584a7e..1104fe8 100644 --- a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java +++ b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java @@ -83,7 +83,7 @@ public class ChannelServiceImpl implements ChannelService { public Users getChannelOrder(int channelId,int type){return channelMapper.getChannelOrder(channelId,type,1);} @Override - public List getOrderList(int channelId,int type){return channelMapper.getOrderList(channelId,type,1);} + public List getOrderList(int channelId,int agentId,int type){return channelMapper.getOrderList(channelId,agentId,type,1);} @Override public List getRegisterDetailList(int channelId,int agentId,int type){return channelMapper.getRegisterDetailList(channelId,agentId,type);} diff --git a/src/main/resources/mapper/ChannelMapper.xml b/src/main/resources/mapper/ChannelMapper.xml index 038c19d..4a5fc2e 100644 --- a/src/main/resources/mapper/ChannelMapper.xml +++ b/src/main/resources/mapper/ChannelMapper.xml @@ -275,6 +275,9 @@ and channelId=#{channelId} + + and agentId=#{agentId} + and DateDiff(dd,intime,getdate())=0 -- libgit2 0.21.0