From 239a44afdcd79d0a967ee6eacdc01a47d730c42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 18 Mar 2020 14:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             |  2 +-
 business/model/dao/store_sku.go               |  2 ++
 business/partner/purchase/jx/localjx/order.go | 16 ++++++----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 68516ef72..38030778b 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -523,7 +523,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	t3.id store_id, t3.name store_name, t3.pay_percentage,
 	t1.*,
 	t2.name_id, t2.id sku_id, t2.spec_quality sku_spec_quality, t2.spec_unit sku_spec_unit, t2.weight, t2m.vendor_thing_id sku_jd_id,
-	t2.comment, t2.category_id sku_category_id, t2.status sku_status,
+	t2.comment, t2.category_id sku_category_id, t2.status sku_status, t2.eclp_id,
 	t4.created_at bind_created_at, t4.updated_at bind_updated_at, t4.last_operator bind_last_operator, t4.deleted_at bind_deleted_at,
 	t4.sub_store_id, t4.price bind_price, IF(t4.unit_price IS NOT NULL, t4.unit_price, t1.price) unit_price, t4.status store_sku_status, t4.auto_sale_at,
 	t4.ebai_id, t4.mtwm_id,
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 4435ad029..2f1bf76e9 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -233,6 +233,8 @@ type StoreSkuExt struct {
 
 	EarningPrice int `json:"earningPrice"`
 	EarningActID int `orm:"column(earning_act_id)" json:"earningActID"`
+
+	EclpID string `orm:"column(eclp_id)" json:"eclpID"`
 }
 
 type SkuNameAndPlace struct {
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 167d4aeef..4b2a87724 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -489,16 +489,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 			if fromStoreID != 0 {
 				if v.EclpID == "" {
 					return nil, nil, fmt.Errorf("此商品物料编码为空，请联系管理员！skuID:[%v]", v.ID)
-				} else {
-					result, err := api.JdEclpAPI.QueryStock(v.EclpID)
-					if err != nil {
-						return nil, nil, err
-					}
-					if len(result) > 0 {
-						if result[0].UsableNum == 0 {
-							return nil, nil, fmt.Errorf("此商品库存不足无法购买，请联系管理员！skuID:[%v]", v.ID)
-						}
-					}
 				}
 			}
 			skuMap[v.ID] = v
@@ -514,6 +504,12 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		}
 		for _, v := range skus {
 			if storeSkuBind := storeSkuMap[v.SkuID]; storeSkuBind != nil {
+				result2, _ := api.JdEclpAPI.QueryStock(storeSkuBind.EclpID)
+				if len(result2) > 0 {
+					if result2[0].UsableNum < v.Count {
+						return nil, nil, fmt.Errorf("此商品库存不足无法购买，请联系管理员！skuID:[%v]", v.SkuID)
+					}
+				}
 				if sku := skuMap[v.SkuID]; sku != nil {
 					jxSku := &JxSkuInfo{
 						SkuID:     v.SkuID,