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-09 10:55:10 +08:00
parent 942adbea46
commit c64476cc51
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,7 +504,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
sum int //申请物料的店的最近销量，以下会根据销量计算具体袋子的价格 sum int //申请物料的店的最近销量，以下会根据销量计算具体袋子的价格
flag = false //新店袋子拆分当个参数 flag = false //新店袋子拆分当个参数
) )
if fromStoreID != 0 { if fromStoreID != 0 && fromStoreID != -1 {
result, _ = orderman.GetMatterStoreOrderCount(nil, fromStoreID) result, _ = orderman.GetMatterStoreOrderCount(nil, fromStoreID)
sum = result.Count sum = result.Count
} }
@@ -527,6 +527,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
Weight: sku.Weight, Weight: sku.Weight,
Name: jxutils.ComposeSkuName(sku.Prefix, sku.Name, sku.Comment, sku.Unit, sku.SpecQuality, sku.SpecUnit, 0, sku.ExPrefix, sku.ExPrefixBegin, sku.ExPrefixEnd), Name: jxutils.ComposeSkuName(sku.Prefix, sku.Name, sku.Comment, sku.Unit, sku.SpecQuality, sku.SpecUnit, 0, sku.ExPrefix, sku.ExPrefixBegin, sku.ExPrefixEnd),
} }
if fromStoreID != -1 {
//活动商品要拆分，一分钱的单独列一个(count为1)，正常价格的列在一起(count叠加) //活动商品要拆分，一分钱的单独列一个(count为1)，正常价格的列在一起(count叠加)
if storeSkuBind.ActPrice != 0 && storeSkuBind.ActPrice < storeSkuBind.JxPrice { if storeSkuBind.ActPrice != 0 && storeSkuBind.ActPrice < storeSkuBind.JxPrice {
jxSku.SalePrice = int64(storeSkuBind.ActPrice) jxSku.SalePrice = int64(storeSkuBind.ActPrice)
@@ -545,8 +546,9 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
jxSku = nil jxSku = nil
} }
} }
}
if jxSku != nil { if jxSku != nil {
if fromStoreID == 0 { if fromStoreID == 0 || fromStoreID == -1 {
outJxOrder.Skus = append(outJxOrder.Skus, jxSku) outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
} else { //以下else为物料订单袋子金额和数量处理 } else { //以下else为物料订单袋子金额和数量处理