liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料订单调度问题，刷新库存更改api

Browse Source
This commit is contained in:
苏尹岚
2020-03-18 14:05:22 +08:00
parent fd4455ea95
commit fbb059b071
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxstore/cms/store_sku.go
View File

@@ -3949,15 +3949,15 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
if err != nil || len(skus) == 0 { if err != nil || len(skus) == 0 {
return err return err
} }
result, err := api.JdEclpAPI.SearchShopStock(skus[0].EclpID) result, err := api.JdEclpAPI.QueryStock(skus[0].EclpID)
if err != nil || result == nil { if err != nil || result == nil {
return err return err
} }
var isSale = 0 var isSale = 0
if len(result.Data) == 0 { if len(result) == 0 {
isSale = -1 isSale = -1
} else { } else {
if utils.Str2Int64(result.Data[0].StockNum) > 0 { if result[0].UsableNum > 0 {
isSale = 1 isSale = 1
} else { } else {
isSale = -1 isSale = -1
@@ -3979,17 +3979,17 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
skuBindInfos = append(skuBindInfos, storeSkuBind) skuBindInfos = append(skuBindInfos, storeSkuBind)
} }
} else { } else {
result, err := api.JdEclpAPI.SearchShopStock("") result, err := api.JdEclpAPI.QueryStock("")
if err != nil { if err != nil {
return err return err
} }
for _, v := range result.Data { for _, v := range result {
skus, err := dao.GetSkus(db, nil, nil, nil, nil, []string{v.GoodsNo}) skus, err := dao.GetSkus(db, nil, nil, nil, nil, []string{v.GoodsNo})
if err != nil || len(skus) == 0 { if err != nil || len(skus) == 0 {
continue continue
} }
var isSale = 0 var isSale = 0
if utils.Str2Int64(v.StockNum) > 0 { if v.UsableNum > 0 {
isSale = 1 isSale = 1
} else { } else {
isSale = -1 isSale = -1

4
business/partner/purchase/jx/localjx/order.go
View File

@@ -762,6 +762,8 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
order.FromStoreID = jxOrder.FromStoreID order.FromStoreID = jxOrder.FromStoreID
order.WaybillVendorID = model.VendorIDJDWL order.WaybillVendorID = model.VendorIDJDWL
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
order.DeliveryType = model.OrderDeliveryTypeSelfTake
order.Flag = 1
} }
return order, err return order, err
} }
@@ -923,7 +925,7 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
errList.AddErr(err) errList.AddErr(err)
} }
} }
if err == nil{ if err == nil {
MarkArrears(db, order, orderPay) MarkArrears(db, order, orderPay)
err2 := CancelMatterOrder(db, order, reason) err2 := CancelMatterOrder(db, order, reason)
errList.AddErr(err2) errList.AddErr(err2)