From 8ff1c377742cfc6449dd383fa5f739050f748a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 25 Feb 2020 16:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BE=85=E6=8B=A3=E8=B4=A7?=
 =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 65cffb128..16f400ee9 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -49,8 +49,9 @@ type StoresOrderSaleInfo struct {
 
 type OrderSkusAccept struct {
 	model.SkuAndName
-	SumWeight int `json:"sumWeight"`
-	SumCount  int `json:"sumCount"`
+	SumWeight int    `json:"sumWeight"`
+	SumCount  int    `json:"sumCount"`
+	Img       string `json:"img"`
 }
 
 func (c *OrderManager) GetStoreOrderCountInfo(ctx *jxcontext.Context, storeID, lastHours int, isIncludeFake bool) (countInfo []*model.GoodsOrderCountInfo, err error) {
@@ -1148,7 +1149,7 @@ func (c *OrderManager) RefreshOrderFinancial(ctx *jxcontext.Context, fromTime, t
 func GetOrdersAccept(ctx *jxcontext.Context, storeID int) (result []*OrderSkusAccept, err error) {
 	db := dao.GetDB()
 	sql := `
-		SELECT SUM(a.count) sum_count, SUM(a.weight*a.count) sum_weight, c.*, d.name, d.unit, d.prefix 
+		SELECT SUM(a.count) sum_count, SUM(a.weight*a.count) sum_weight, c.*, d.name, d.unit, d.prefix, d.img
 		FROM order_sku a
 		JOIN goods_order b ON b.vendor_order_id = a.vendor_order_id AND b.vendor_id = a.vendor_id
 		JOIN sku c ON c.id = a.sku_id 
@@ -1157,6 +1158,7 @@ func GetOrdersAccept(ctx *jxcontext.Context, storeID int) (result []*OrderSkusAc
 		AND b.status = ?
 		AND b.order_created_at <= NOW() AND b.order_created_at >= ?
 		GROUP BY 3
+		ORDER BY sum_weight DESC
 	`
 	sqlParams := []interface{}{
 		storeID,