From afda64cdd61b356df9aaf1163d6f179e9073b628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 18 Aug 2020 17:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E6=B4=BB=E5=8A=A8=E4=B8=8D?=
 =?UTF-8?q?=E9=99=90=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index f7d405e74..5d65877fe 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -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 {