菜市物料同步到果园修改
This commit is contained in:
@@ -4380,18 +4380,16 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Println("storeSkus", utils.Format4Output(storeSkus, false))
|
||||
if len(storeSkus) > 0 {
|
||||
var (
|
||||
skuBindInfos []*StoreSkuBindInfo
|
||||
skuName2 *model.SkuName
|
||||
)
|
||||
sql := `
|
||||
SELECT * FROM sku_name a, sku b WHERE a.id = b.name_id AND b.eclp_id = ? AND a.deleted_at = ?
|
||||
SELECT a.* FROM sku_name a, sku b WHERE a.id = b.name_id AND b.eclp_id = ? AND a.deleted_at = ?
|
||||
`
|
||||
sqlParams := []interface{}{v.EclpID, utils.DefaultTimeValue}
|
||||
err = dao.GetRow(db, &skuName2, sql, sqlParams)
|
||||
fmt.Println("skuName2", utils.Format4Output(skuName2, false))
|
||||
if skuName2 != nil {
|
||||
skuBindInfo := &StoreSkuBindInfo{
|
||||
NameID: skuName2.ID,
|
||||
|
||||
@@ -698,7 +698,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
||||
} else if outJxOrder.Weight > 3000 && outJxOrder.Weight <= splitMatterOrderMinWeight {
|
||||
outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-3000)/1000)*200)
|
||||
} else {
|
||||
fmt.Println("jxOrder", utils.Format4Output(jxOrder, false))
|
||||
_, freightPrice, _ := tryToSplitMatterOrder(jxOrder)
|
||||
outJxOrder.FreightPrice = freightPrice
|
||||
}
|
||||
@@ -1545,7 +1544,6 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
|
||||
freightPrice += utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(v.Weight)-3000)/1000)*200)
|
||||
}
|
||||
}
|
||||
fmt.Println("outOrders", utils.Format4Output(outOrders, false))
|
||||
return outOrders, freightPrice, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user