bugfix

src/main/java/com/caimei365/commodity/model/po/ProductDetailInfoPo.java

@@ -26,7 +26,7 @@ public class ProductDetailInfoPo implements Serializable {
     /**
      * 普通机构商品详情信息
      */
-    private String detailInfo2;
+    private String commonDetailInfo;
     /**
      * 服务详情
      */

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -536,14 +536,17 @@ public class PageServiceImpl implements PageService {
         // 商品详情
         ProductDetailInfoPo productDetail = shopMapper.getProductDetailInfo(productId);
         //非资质机构商品详情展示普通机构商品详情,游客和普通机构要进判断
-        if (null == identity || 4 == identity) {
-            String chose = product.getProductDetailChose();
-            if (StringUtils.isNotEmpty(chose) && "2".equals(chose)) {
-                //将商品详情展示为普通机构商品详情
-                String info = null == productDetail.getDetailInfo2() ? "若要查看更多产品信息，请注册机构会员，如有疑问请联系客服。" : productDetail.getDetailInfo2();
-                productDetail.setDetailInfo(info);
-            }
-        }
+//        if (null == identity || 4 == identity) {
+//            String chose = product.getProductDetailChose();
+//            log.info("身份identity===================>"+identity+"ProductDetail===================》"+chose);
+//            if (StringUtils.isNotEmpty(chose) && "2".equals(chose)) {
+//                //将商品详情展示为普通机构商品详情
+//                String info = null == productDetail.getDetailInfo2() ? "若要查看更多产品信息，请注册机构会员，如有疑问请联系客服。" : productDetail.getDetailInfo2();
+//                log.info("DetailInfo2参数================================》"+info);
+//                productDetail.setDetailInfo(info);
+//            }
+//        }
+        log.info("-------------------》productDetail参数"+productDetail.toString());
         product.setProductDetail(productDetail);
         // 相关参数
         List<ProductParameterPo> parametersList = shopMapper.getProductParameters(productId);

src/main/resources/mapper/ShopMapper.xml

@@ -489,7 +489,7 @@
         where productID = #{productId} order by mainFlag desc
     </select>
     <select id="getProductDetailInfo" resultType="com.caimei365.commodity.model.po.ProductDetailInfoPo">
-        select productDetailInfoId, productId, detailInfo, detailInfo2,serviceInfo, orderInfo, propValueAlias,
+        select productDetailInfoId, productId, detailInfo, commonDetailInfo,serviceInfo, orderInfo, propValueAlias,
                 propValueImages, detailInfoTxt, seoTitle, seoKeyword, seoDes
         from productdetailinfo
         where productId = #{productId}