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)