From fbb059b0718cc70d09443dd3cbb6fa1f6ccc78c0 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:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=B7=E6=96=B0=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9B=B4=E6=94=B9api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 12 ++++++------
 business/partner/purchase/jx/localjx/order.go |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 2aff565fc..68516ef72 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -3949,15 +3949,15 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
 		if err != nil || len(skus) == 0 {
 			return err
 		}
-		result, err := api.JdEclpAPI.SearchShopStock(skus[0].EclpID)
+		result, err := api.JdEclpAPI.QueryStock(skus[0].EclpID)
 		if err != nil || result == nil {
 			return err
 		}
 		var isSale = 0
-		if len(result.Data) == 0 {
+		if len(result) == 0 {
 			isSale = -1
 		} else {
-			if utils.Str2Int64(result.Data[0].StockNum) > 0 {
+			if result[0].UsableNum > 0 {
 				isSale = 1
 			} else {
 				isSale = -1
@@ -3979,17 +3979,17 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
 			skuBindInfos = append(skuBindInfos, storeSkuBind)
 		}
 	} else {
-		result, err := api.JdEclpAPI.SearchShopStock("")
+		result, err := api.JdEclpAPI.QueryStock("")
 		if err != nil {
 			return err
 		}
-		for _, v := range result.Data {
+		for _, v := range result {
 			skus, err := dao.GetSkus(db, nil, nil, nil, nil, []string{v.GoodsNo})
 			if err != nil || len(skus) == 0 {
 				continue
 			}
 			var isSale = 0
-			if utils.Str2Int64(v.StockNum) > 0 {
+			if v.UsableNum > 0 {
 				isSale = 1
 			} else {
 				isSale = -1
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index ac8ee993f..5c41baeaf 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -762,6 +762,8 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 		order.FromStoreID = jxOrder.FromStoreID
 		order.WaybillVendorID = model.VendorIDJDWL
 		order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
+		order.DeliveryType = model.OrderDeliveryTypeSelfTake
+		order.Flag = 1
 	}
 	return order, err
 }
@@ -923,11 +925,11 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 							errList.AddErr(err)
 						}
 					}
-					if err == nil{
+					if err == nil {
 						MarkArrears(db, order, orderPay)
 						err2 := CancelMatterOrder(db, order, reason)
 						errList.AddErr(err2)
-					}	
+					}
 				} else {
 					orderPay.Status = model.PayStatusCanceled
 					_, err2 := dao.UpdateEntity(db, orderPay)