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

菜市物料同步到果园修改

Browse Source
This commit is contained in:
苏尹岚
2020-04-28 13:55:49 +08:00
parent 4902749d6c
commit ec38b3b7f1
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4380,18 +4380,16 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
if err != nil { if err != nil {
return err return err
} }
fmt.Println("storeSkus", utils.Format4Output(storeSkus, false))
if len(storeSkus) > 0 { if len(storeSkus) > 0 {
var ( var (
skuBindInfos []*StoreSkuBindInfo skuBindInfos []*StoreSkuBindInfo
skuName2 *model.SkuName skuName2 *model.SkuName
) )
sql := ` 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} sqlParams := []interface{}{v.EclpID, utils.DefaultTimeValue}
err = dao.GetRow(db, &skuName2, sql, sqlParams) err = dao.GetRow(db, &skuName2, sql, sqlParams)
fmt.Println("skuName2", utils.Format4Output(skuName2, false))
if skuName2 != nil { if skuName2 != nil {
skuBindInfo := &StoreSkuBindInfo{ skuBindInfo := &StoreSkuBindInfo{
NameID: skuName2.ID, NameID: skuName2.ID,

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

@@ -698,7 +698,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} else if outJxOrder.Weight > 3000 && outJxOrder.Weight <= splitMatterOrderMinWeight { } else if outJxOrder.Weight > 3000 && outJxOrder.Weight <= splitMatterOrderMinWeight {
outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-3000)/1000)*200) outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-3000)/1000)*200)
} else { } else {
fmt.Println("jxOrder", utils.Format4Output(jxOrder, false))
_, freightPrice, _ := tryToSplitMatterOrder(jxOrder) _, freightPrice, _ := tryToSplitMatterOrder(jxOrder)
outJxOrder.FreightPrice = freightPrice 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) freightPrice += utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(v.Weight)-3000)/1000)*200)
} }
} }
fmt.Println("outOrders", utils.Format4Output(outOrders, false))
return outOrders, freightPrice, err return outOrders, freightPrice, err
} }