From 1517ea4520ceb5bdbf20cad11b12e13071f6ad9e 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, 18 Aug 2020 10:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     |  1 +
 business/model/dao/dao_order.go               | 20 ++++++++++++++-----
 business/partner/purchase/jx/localjx/order.go |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index a324e3111..7b8adfc17 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -736,6 +736,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				// if order.VendorID == model.VendorIDJX {
 				// 	excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
 				// }
+
 				if savedOrderInfo != nil {
 					//TODO 2020-07-21 发单时间要在门店的营业时间内
 					if savedOrderInfo.storeDetail != nil {
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 0f1c6e031..ea744df7b 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -1346,9 +1346,17 @@ func GetAfsOrdersByPage(db *DaoDB, vendorOrderID, afsOrderID, userID string, fro
 	return afsOrderList, totalCount, err
 }
 
-func GetSupplySupportStoreSkus(db *DaoDB, fromDate, toDate time.Time, fromStoreID, storeID int, percentage float64) (orderSkus []*model.OrderSku, err error) {
+type GetSupplySupportStoreSkusResult struct {
+	SkuID     int `orm:"column(sku_id)" json:"skuID"`
+	Count     int `json:"count"`
+	SalePrice int `json:"salePrice"`
+	Stock     int `json:"stock"`
+	model.SkuName
+}
+
+func GetSupplySupportStoreSkus(db *DaoDB, fromDate, toDate time.Time, fromStoreID, storeID int, percentage float64) (getSupplySupportStoreSkusResult []*GetSupplySupportStoreSkusResult, err error) {
 	sql := `
-		SELECT c.sku_id,CEIL(c.count) count,CEIL(c.count)  * d.jx_price sale_price 
+		SELECT c.sku_id,CEIL(c.count) count,CEIL(c.count)  * d.jx_price sale_price, d.stock, f.*
 		FROM
 		(
 			SELECT a.sku_id,SUM(a.count * ? ) count  FROM order_sku a 
@@ -1360,6 +1368,8 @@ func GetSupplySupportStoreSkus(db *DaoDB, fromDate, toDate time.Time, fromStoreI
 			GROUP BY 1 
 		)c
 		JOIN store_sku_bind d ON d.store_id = ? AND d.sku_id = c.sku_id AND d.deleted_at = ?
+		JOIN sku e ON e.id = d.sku_id 
+		JOIN sku_name f ON f.id = e.name_id
 		ORDER BY c.count desc
 	`
 	sqlParams := []interface{}{
@@ -1370,8 +1380,8 @@ func GetSupplySupportStoreSkus(db *DaoDB, fromDate, toDate time.Time, fromStoreI
 		fromStoreID,
 		storeID, utils.DefaultTimeValue,
 	}
-	if err = GetRows(db, &orderSkus, sql, sqlParams); err == nil {
-		return orderSkus, err
+	if err = GetRows(db, &getSupplySupportStoreSkusResult, sql, sqlParams); err == nil {
+		return getSupplySupportStoreSkusResult, err
 	}
-	return orderSkus, err
+	return getSupplySupportStoreSkusResult, err
 }
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 08400ba92..406e9b066 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1796,7 +1796,7 @@ func buildJxOrderInfo(order *model.GoodsOrder, orderSkus []*model.OrderSku) (jxO
 	return jxOrder
 }
 
-func GetSupplySupportStoreSkus(ctx *jxcontext.Context, fromDate, toDate string, fromStoreID, storeID int, percentage string) (orderSkus []*model.OrderSku, err error) {
+func GetSupplySupportStoreSkus(ctx *jxcontext.Context, fromDate, toDate string, fromStoreID, storeID int, percentage string) (orderSkus []*dao.GetSupplySupportStoreSkusResult, err error) {
 	var (
 		db = dao.GetDB()
 	)