bugfix

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -429,6 +429,9 @@ public class SubmitServiceImpl implements SubmitService {
 
             // 店铺促销活动状态
             PromotionsVo shopPromotions = baseMapper.getPromotionByShopId(shopId);
+            if (shopPromotions != null && shopPromotions.getSeen() != null && shopPromotions.getSeen() == 2 && 3 == orderParamBo.getCartType()) {
+                shopPromotions = null;
+            }
             // 商品费
             AtomicDouble shopProductFee = new AtomicDouble(0);
             // 供应商下参与店铺促销的商品总价
@@ -506,12 +509,9 @@ public class SubmitServiceImpl implements SubmitService {
                         promotions = baseMapper.getPromotionByProductId(productId);
                     }
                     //促销活动如果协销不可见，置为空
-                    if (promotions != null && promotions.getSeen() != null && promotions.getSeen() == 2 && userIdentity == 1) {
+                    if (promotions != null && promotions.getSeen() != null && promotions.getSeen() == 2 && 3 == orderParamBo.getCartType()) {
                         promotions = null;
                     }
-                    if (shopPromotions != null && shopPromotions.getSeen() != null && shopPromotions.getSeen() == 2 && userIdentity == 1) {
-                        shopPromotions = null;
-                    }
                     // 计算单价
                     if (null != svipProductPo && 1 == svipProductPo.getSvipProductFlag()) {
                         // 超级会员优惠商品,不参与促销活动（普通机构购买该商品可参与店铺促销）/阶梯价/复购价