From 13b0c6fcb1953ccd9c1be59f54ca3745805ddd91 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 8 Sep 2020 21:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E7=A7=92=E6=9D=80=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8E=9F=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/impl/YxStoreCombinationServiceImpl.java     | 1 +
 .../modules/activity/service/impl/YxStoreSeckillServiceImpl.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
index f8574a17..20d4786c 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
@@ -270,6 +270,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
         }
 
         yxStoreCombination.setPrice(BigDecimal.valueOf(resultDTO.getMinPrice()));
+        yxStoreCombination.setProductPrice(BigDecimal.valueOf(resultDTO.getMinOtPrice()));
         yxStoreCombination.setCost(resultDTO.getMinCost().intValue());
         yxStoreCombination.setStock(resultDTO.getStock());
         yxStoreCombination.setImages(String.join(",", resources.getImages()));
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
index 5d4f4f11..2cd3ffbc 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
@@ -253,6 +253,7 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
         }
 
         yxStoreSeckill.setStock(resultDTO.getStock());
+        yxStoreSeckill.setOtPrice(BigDecimal.valueOf(resultDTO.getMinOtPrice()));
         yxStoreSeckill.setPostage(BigDecimal.valueOf(resultDTO.getMinPrice()));
         yxStoreSeckill.setCost(BigDecimal.valueOf(resultDTO.getMinCost()));
         yxStoreSeckill.setStock(resultDTO.getStock());