折扣活动不限购

This commit is contained in:
苏尹岚
2020-08-18 17:47:55 +08:00
parent 7e59970977
commit afda64cdd6

View File

@@ -635,7 +635,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
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),
}
if fromStoreID != -1 {
if fromStoreID != -1 && storeSkuBind.ActType != model.ActSkuDiscount {
//活动商品要拆分,一分钱的单独列一个(count为1),正常价格的列在一起(count叠加)
if storeSkuBind.ActPrice != 0 && storeSkuBind.ActPrice < storeSkuBind.JxPrice {
jxSku.SalePrice = int64(storeSkuBind.ActPrice)
@@ -654,6 +654,8 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
jxSku = nil
}
}
} else if storeSkuBind.ActType == model.ActSkuDiscount {
jxSku.SalePrice = int64(storeSkuBind.ActPrice)
}
if jxSku != nil {
// if fromStoreID == 0 || fromStoreID == -1 {