From f054243c77c0249f06dc366a73cdf82cc2624624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 21 Feb 2020 16:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AA=E6=8B=A3=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go        |  2 ++
 business/jxcallback/orderman/orderman_ext.go | 28 ++++++++++++++++++++
 controllers/jx_order.go                      | 14 ++++++++++
 routers/commentsRouter_controllers.go        |  9 +++++++
 4 files changed, 53 insertions(+)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 6e6a51564..1a2c2991e 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -872,3 +872,5 @@ func RefreshOrdersPriceInfo(ctx *jxcontext.Context, fromTime, toTime time.Time,
 	}
 	return hint, err
 }
+
+
diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 0d9153c59..65cffb128 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -47,6 +47,12 @@ type StoresOrderSaleInfo struct {
 	EarningPrice int64 `json:"earningPrice"` // 预估结算给门店老板的钱
 }
 
+type OrderSkusAccept struct {
+	model.SkuAndName
+	SumWeight int `json:"sumWeight"`
+	SumCount  int `json:"sumCount"`
+}
+
 func (c *OrderManager) GetStoreOrderCountInfo(ctx *jxcontext.Context, storeID, lastHours int, isIncludeFake bool) (countInfo []*model.GoodsOrderCountInfo, err error) {
 	globals.SugarLogger.Debugf("GetStoreOrderCountInfo storeID:%d", storeID)
 	if lastHours > maxLastHours {
@@ -1138,3 +1144,25 @@ func (c *OrderManager) RefreshOrderFinancial(ctx *jxcontext.Context, fromTime, t
 	}
 	return hint, err
 }
+
+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 
+		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 
+		JOIN sku_name d ON d.id = c.name_id
+		WHERE IF(b.store_id = 0,b.jx_store_id,b.store_id) = ?
+		AND b.status = ?
+		AND b.order_created_at <= NOW() AND b.order_created_at >= ?
+		GROUP BY 3
+	`
+	sqlParams := []interface{}{
+		storeID,
+		model.OrderStatusAccepted,
+		time.Now().AddDate(0, 0, -1),
+	}
+	err = dao.GetRows(db, &result, sql, sqlParams)
+	return result, err
+}
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index dffe0768f..34d6ee3d1 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -988,3 +988,17 @@ func (c *OrderController) RefreshOrdersPriceInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 获取某个门店订单中待拣货商品
+// @Description 获取某个门店订单中待拣货商品
+// @Param	token			header	string	true	"认证token"
+// @Param	storeID			query	int		true	"门店ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetOrdersAccept [get]
+func (c *OrderController) GetOrdersAccept() {
+	c.callGetOrdersAccept(func(params *tOrderGetOrdersAcceptParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = orderman.GetOrdersAccept(params.Ctx, params.StoreID)
+		return retVal, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 2eea1a1a7..9d46de0d6 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -999,6 +999,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "GetOrdersAccept",
+            Router: `/GetOrdersAccept`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "GetOrdersSupplement",