diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 406e9b066..b95eadcfc 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -546,11 +546,14 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 } skuMap := make(map[int]*model.SkuAndName) for _, v := range skuList { - if jxOrder.OrderType == model.OrderTypeMatter { + if fromStoreID != 0 { if v.EclpID == "" { return nil, nil, fmt.Errorf("此商品物料编码为空,请联系管理员!skuID:[%v]", v.ID) } } + // if jxOrder.OrderType == model.OrderTypeMatter { + + // } skuMap[v.ID] = v } var ( @@ -558,10 +561,14 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 sum int //申请物料的店的最近销量,以下会根据销量计算具体袋子的价格 flag = false //新店袋子拆分当个参数 ) - if jxOrder.OrderType == model.OrderTypeMatter && fromStoreID != -1 { + if fromStoreID != 0 && fromStoreID != -1 { result, _ = orderman.GetMatterStoreOrderCount(nil, fromStoreID) sum = result.Count } + // if jxOrder.OrderType == model.OrderTypeMatter && fromStoreID != -1 { + // result, _ = orderman.GetMatterStoreOrderCount(nil, fromStoreID) + // sum = result.Count + // } if jxOrder.Weight == 0 { for _, v := range jxOrder.Skus { v.Weight = storeSkuMap[v.SkuID].Weight @@ -570,13 +577,15 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 } for _, v := range skus { if storeSkuBind := storeSkuMap[v.SkuID]; storeSkuBind != nil { - if jxOrder.OrderType == model.OrderTypeMatter { + if fromStoreID != 0 { + // if jxOrder.OrderType == model.OrderTypeMatter { 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{