From eca46c743b52848659716f9f14bf0457869986ea Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Fri, 12 Jun 2020 10:07:55 +0800
Subject: [PATCH] 1

---
 src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java | 10 +++++++++-
 src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java         | 28 ++++++++++++++++++++++++++++
 src/main/resources/application.yaml                                        | 12 ++++++------
 src/main/resources/mapper/ChannelProductMapper.xml                         | 12 ++++++++++++
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
index c2a163c..8a2a17b 100644
--- a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
+++ b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
@@ -525,7 +525,15 @@ public class ChannelController {
         order.setUsersList(orderList);
         list.add(order);
         Statistics statistics=new Statistics();
-        statistics.setDiscountPackageList(channelService.getOrderList(channelId,agentId,type));
+        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);
         list.add(statistics);
         result.setData(list);
         return result;
diff --git a/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java b/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java
index d18a0fb..fcf60d2 100644
--- a/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java
+++ b/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java
@@ -23,6 +23,34 @@ public class ChannelProduct {
 
     private Date createTime;
 
+    private String promotionPrice ;
+    private Date endTime ;
+    private String title ;
+
+    public String getPromotionPrice() {
+        return promotionPrice;
+    }
+
+    public void setPromotionPrice(String promotionPrice) {
+        this.promotionPrice = promotionPrice;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public Integer getId() {
         return id;
     }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index d1a6229..811379a 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -4,12 +4,12 @@ spring:
   application:
     name: wechatBusiness
   datasource:
-#    username: SZJXTUSER
-#    password: xst200919
-#    url: jdbc:sqlserver://60.190.202.57:14333;database=wechatbusiness
-    username: report
-    password: QWer123$%^
-    url: jdbc:sqlserver://116.62.241.27:33419;database=wechatbusiness
+    username: SZJXTUSER
+    password: xst200919
+    url: jdbc:sqlserver://60.190.202.57:14333;database=wechatbusiness
+#    username: report
+#    password: QWer123$%^
+#    url: jdbc:sqlserver://116.62.241.27:33419;database=wechatbusiness
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 
   jackson:
diff --git a/src/main/resources/mapper/ChannelProductMapper.xml b/src/main/resources/mapper/ChannelProductMapper.xml
index a1e4f17..42c3d6a 100644
--- a/src/main/resources/mapper/ChannelProductMapper.xml
+++ b/src/main/resources/mapper/ChannelProductMapper.xml
@@ -12,6 +12,9 @@
         <result column="caption" jdbcType="VARCHAR" property="caption" />
         <result column="state" jdbcType="INTEGER" property="state"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="promotion_price" jdbcType="VARCHAR" property="promotionPrice" />
+        <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+        <result column="title" jdbcType="VARCHAR" property="title" />
     </resultMap>
 
     <select id="getList" parameterType="java.lang.Integer" resultMap="ChannelProductMap">
@@ -33,6 +36,15 @@
             <if test="caption!=null and caption!=''">
                 caption=#{caption},
             </if>
+            <if test="promotionPrice!=null and promotionPrice!=''">
+                promotion_price=#{promotionPrice},
+            </if>
+            <if test="endTime!=null and endTime!=''">
+                end_time=#{endTime},
+            </if>
+            <if test="title!=null and title!=''">
+                title=#{title},
+            </if>
         </trim>
         where id = #{id}
     </update>
--
libgit2 0.21.0