1
This commit is contained in:
@@ -1753,6 +1753,12 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
orderCount.Count = int(utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(orderCount.Count) * 1.1)))
|
orderCount.Count = int(utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(orderCount.Count) * 1.1)))
|
||||||
|
if orderCount.Count <= 0 {
|
||||||
|
stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, nil, "")
|
||||||
|
if len(stores) > 0 && time.Since(stores[0].CreatedAt) > 7*24*time.Hour {
|
||||||
|
flag = false
|
||||||
|
}
|
||||||
|
}
|
||||||
orderCount.Flag = flag
|
orderCount.Flag = flag
|
||||||
// orderCount.Count = 1000
|
// orderCount.Count = 1000
|
||||||
return orderCount, err
|
return orderCount, err
|
||||||
|
|||||||
@@ -817,9 +817,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
|||||||
result, _ = orderman.GetMatterStoreOrderCount(nil, fromStoreID)
|
result, _ = orderman.GetMatterStoreOrderCount(nil, fromStoreID)
|
||||||
sum = result.Count
|
sum = result.Count
|
||||||
}
|
}
|
||||||
if sum <= 0 {
|
|
||||||
return nil, nil, fmt.Errorf("没有足够的订单兑换物料")
|
|
||||||
}
|
|
||||||
if jxOrder.Weight == 0 {
|
if jxOrder.Weight == 0 {
|
||||||
for _, v := range jxOrder.Skus {
|
for _, v := range jxOrder.Skus {
|
||||||
v.Weight = storeSkuMap[v.SkuID].Weight
|
v.Weight = storeSkuMap[v.SkuID].Weight
|
||||||
|
|||||||
Reference in New Issue
Block a user