From 4582f838a70dfa6e0e675693e349c10ef9ad5c73 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Fri, 12 Jun 2020 12:56:58 +0800
Subject: [PATCH] 1

---
 src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java | 20 ++++++++++----------
 src/main/resources/mapper/ChannelProductMapper.xml                         |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
index 8a2a17b..c656d42 100644
--- a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
+++ b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
@@ -525,15 +525,7 @@ public class ChannelController {
         order.setUsersList(orderList);
         list.add(order);
         Statistics statistics=new Statistics();
-        List<DiscountPackage> packageList = new ArrayList<>();
-        packageList.addAll(channelService.getOrderList(channelId,agentId,type));
-        if(agentId == 0){
-            List<Agent> agents = agentService.getList(channelId);
-            for(Agent agent : agents){
-                packageList.addAll(channelService.getOrderList(channelId,agent.getId(),type));
-            }
-        }
-        statistics.setDiscountPackageList(packageList);
+        statistics.setDiscountPackageList(channelService.getOrderList(channelId,agentId,type));
         list.add(statistics);
         result.setData(list);
         return result;
@@ -551,7 +543,15 @@ public class ChannelController {
     @ApiOperation(value = "获取订购详情")
     public BaseDto<List<DiscountPackage>> GetStatisticsOrderDetailList(int channelId,int agentId,int type,int productId){
         BaseDto<List<DiscountPackage>> result=new BaseDto<>();
-        result.setData(channelService.getOrderDetailList(channelId,agentId,type,productId));
+        List<DiscountPackage> packageList = new ArrayList<>();
+        packageList.addAll(channelService.getOrderDetailList(channelId,agentId,type,productId));
+        if(agentId == 0){
+            List<Agent> agents = agentService.getList(channelId);
+            for(Agent agent : agents){
+                packageList.addAll(channelService.getOrderDetailList(channelId,agent.getId(),type,productId));
+            }
+        }
+        result.setData(packageList);
         return result;
     }
 
diff --git a/src/main/resources/mapper/ChannelProductMapper.xml b/src/main/resources/mapper/ChannelProductMapper.xml
index 42c3d6a..e10df80 100644
--- a/src/main/resources/mapper/ChannelProductMapper.xml
+++ b/src/main/resources/mapper/ChannelProductMapper.xml
@@ -39,7 +39,7 @@
             <if test="promotionPrice!=null and promotionPrice!=''">
                 promotion_price=#{promotionPrice},
             </if>
-            <if test="endTime!=null and endTime!=''">
+            <if test="endTime!=null">
                 end_time=#{endTime},
             </if>
             <if test="title!=null and title!=''">
--
libgit2 0.21.0