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 11:43:09 +08:00
parent db086ad874
commit cb39bce74d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1178,6 +1178,15 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd
} }
} }
if skuBindInfo.StatusSaleBegin == 0 && skuBindInfo.StatusSaleEnd == 0 {
if skuBind.StatusSaleBegin != skuBindInfo.StatusSaleBegin || skuBind.StatusSaleEnd != skuBindInfo.StatusSaleEnd {
updateFieldMap["StatusSaleBegin"] = 1
updateFieldMap["StatusSaleEnd"] = 1
}
skuBind.StatusSaleBegin = skuBindInfo.StatusSaleBegin
skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd
}
if globals.IsAddEvent { if globals.IsAddEvent {
if len(updateFieldMap) > 0 { if len(updateFieldMap) > 0 {
mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind) mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind)

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

@@ -659,6 +659,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} }
} }
outJxOrder.Weight += jxSku.Count * jxSku.Weight outJxOrder.Weight += jxSku.Count * jxSku.Weight
jxOrder.Weight += jxSku.Count * jxSku.Weight
} }
} }
} }
@@ -1496,7 +1497,6 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
//但是我把JxSkuInfo放进list的时候，想根据一个参数GroupSign判断是否这个商品已经分出去了 //但是我把JxSkuInfo放进list的时候，想根据一个参数GroupSign判断是否这个商品已经分出去了
//但是在list中同一个商品通过以下方式放进去的地址是一样的，我改了一个商品的GroupSign，所有的都变了，所以只有分出一个JxSkuInfo2去弄。。 //但是在list中同一个商品通过以下方式放进去的地址是一样的，我改了一个商品的GroupSign，所有的都变了，所以只有分出一个JxSkuInfo2去弄。。
//要做优化的话更好 //要做优化的话更好
fmt.Println("skus", utils.Format4Output(skus, false))
for _, v := range skus { for _, v := range skus {
for i := 0; i < v.Count; i++ { for i := 0; i < v.Count; i++ {
var sku2 = &JxSkuInfo2{} var sku2 = &JxSkuInfo2{}