促销活动2

src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -87,13 +87,6 @@ public class PriceUtilService {
         Integer identity = priceMapper.getIdentityByUserId(userId);
         // 根据商品id查询商品活动
         PromotionsVo promotions = promotionsMapper.getPromotionsByProductId(price.getProductId());
-        if (null != promotions) {
-            price.setPromotions(promotions);
-            price.setActStatus(1);
-        } else {
-            // 默认非促销活动状态
-            price.setActStatus(0);
-        }
         price.setRepurchaseFlag(0);
         if (null != identity && identity > 0) {
             // 用户身份: 2-会员机构, 4-普通机构
@@ -155,6 +148,15 @@ public class PriceUtilService {
             price.setOriginalPrice(0d);
             price.setNormalPrice(0d);
             price.setUserIdentity(0);
+            if (null != promotions) {
+                price.setActStatus(1);
+                promotions.setTouchPrice(0d);
+                promotions.setReducedPrice(0d);
+                price.setPromotions(promotions);
+            } else {
+                // 默认非促销活动状态
+                price.setActStatus(0);
+            }
         }
         // 屏蔽成本价
         price.setCostProportional(0d);