From f19e4de97eae5496d990240a0bfc90a7b93fe968 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Wed, 13 May 2020 07:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=94=A8=E6=88=B7=E7=BB=9F=E8=AE=A1=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/toesbieya/my/service/StatisticService.java  | 3 ++-
 java/src/main/resources/mapping/BizStock.xml                  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/src/main/java/com/toesbieya/my/service/StatisticService.java b/java/src/main/java/com/toesbieya/my/service/StatisticService.java
index 2b26f17..dd214ff 100644
--- a/java/src/main/java/com/toesbieya/my/service/StatisticService.java
+++ b/java/src/main/java/com/toesbieya/my/service/StatisticService.java
@@ -37,7 +37,8 @@ public class StatisticService {
         FourBlockStat stat = new FourBlockStat();
         double purchase = purchaseOrderMapper.getDailyTotalPurchasePrice(now, null);
         double sell = sellOrderMapper.getDailyTotalPurchasePrice(now, null);
-        stat.setOnline(SocketModule.getOnlineNum());
+        int onlineNum = SocketModule.getOnlineNum();
+        stat.setOnline(onlineNum == 0 ? 1 : onlineNum);//进行此请求时在线用户必然大于0
         stat.setPurchase(purchase);
         stat.setSell(sell);
         stat.setProfit(sell - purchase);
diff --git a/java/src/main/resources/mapping/BizStock.xml b/java/src/main/resources/mapping/BizStock.xml
index b564a95..7bafe6a 100644
--- a/java/src/main/resources/mapping/BizStock.xml
+++ b/java/src/main/resources/mapping/BizStock.xml
@@ -39,7 +39,7 @@
     </select>
     <select id="export" parameterType="com.toesbieya.my.model.vo.search.StockSearch"
             resultType="com.toesbieya.my.model.vo.export.StockExport">
-        select a.cname,a.total_num,a.total_price,b.cgddid,b.cgrkid,b.price cg_price,
+        select a.cid,a.cname,a.total_num,a.total_price,b.cgddid,b.cgrkid,b.price cg_price,
         from_unixtime(b.ctime / 1000, '%Y-%m-%d %H:%m:%s') ctime,
         c.num rk_num,
         d.num cg_num
@@ -57,7 +57,7 @@
         join biz_stock b using (cid)
         left join biz_purchase_inbound_sub c on c.cid = a.cid and c.pid = b.cgrkid
         left join biz_purchase_order_sub d on c.cid = d.cid and d.pid = b.cgddid
-        order by b.cgddid desc, b.cgrkid desc
+        order by a.cid,b.cgddid desc, b.cgrkid desc
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete