Merge branch 'developer' into developerB

src/main/java/com/caimei365/commodity/mapper/PageMapper.java

@@ -28,6 +28,13 @@ public interface PageMapper {
      */
     Integer getPageTypeSort(Integer pageId);
 
+    /**
+     * 查询页面内容标签
+     * @param pageId
+     * @return
+     */
+    String getPageLabel(Integer pageId);
+
     /**
      * 查询热搜词(单个页面)
      *

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

@@ -203,6 +203,11 @@ public class ProductPo implements Serializable {
      * 商品可见度：（3:所有人可见，2:普通机构可见，1:会员机构可见）
      */
     private Integer visibility;
+
+    /**
+     * 商品详情可见度
+     */
+    private Integer commodityDetailsFlag;
     /**
      * 添加时间
      */

src/main/java/com/caimei365/commodity/model/vo/CmPageVo.java

@@ -80,6 +80,10 @@ public class CmPageVo implements Serializable {
      * 背景图方式：1平铺、2填充
      */
     private Integer backgroundImageWay;
+    /**
+     * 页面内容标签
+     */
+    private String contentLabel;
     /**
      * 填充背景类型默认不显示 ：1使用颜色，2使用背景图
      */

src/main/java/com/caimei365/commodity/model/vo/PageDetailVo.java

@@ -75,6 +75,10 @@ public class PageDetailVo implements Serializable {
     private String backgroundImage;
 
     private Integer backgroundImageWay;
+    /**
+     * 页面内容标签
+     */
+    private String contentLabel;
 
     private Integer backgroundType;
 }

src/main/java/com/caimei365/commodity/model/vo/ProductFormVo.java

@@ -209,7 +209,7 @@ public class ProductFormVo implements Serializable {
     /**
      * 械字号类型   (基于械字号基础),1：一类，2：二类，3：三类
      */
-    private String machineType;
+    private Integer machineType;
 
     /**
      * 购买数量: 1逐步增长,2以起订量增长(起订量的倍数增长)

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

@@ -113,6 +113,7 @@ public class PageServiceImpl implements PageService {
         source = source == null ? 1 : source;
         Map<String, Object> map = new HashMap<>(3);
         Integer typeSort = pageMapper.getPageTypeSort(pageId);
+        String contentLabel = pageMapper.getPageLabel(pageId);
         List<HotSearchVo> hotSearchList = pageMapper.getHotSearchByPageId(pageId, source);
         List<PageFloorVo> floorList = pageMapper.getFloorByPageId(pageId, source);
         for (PageFloorVo floor : floorList) {
@@ -124,6 +125,8 @@ public class PageServiceImpl implements PageService {
             floor.setFloorImageList(floorImageList);
         }
         map.put("typeSort", typeSort);
+        log.info("仪器页面数据userId================================》"+userId+"====="+contentLabel);
+        map.put("contentLabel", contentLabel);
         map.put("hotSearchList", hotSearchList);
         map.put("floorList", floorList);
         return ResponseJson.success(map);

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

@@ -86,7 +86,9 @@ public class SecondHandServiceImpl implements SecondHandService {
                 }
                 // 优化地址信息
                 String provinceCityDistrict = second.getProvinceCityDistrict();
-                provinceCityDistrict = provinceCityDistrict.replace("/", "").replace("市辖区", "");
+                if(StringUtils.isNotBlank(provinceCityDistrict)){
+                    provinceCityDistrict = provinceCityDistrict.replace("/", "").replace("市辖区", "");
+                }
                 second.setProvinceCityDistrict(provinceCityDistrict);
                 //价格千分位处理
                 second.setPriceStr(priceFormatStr(second.getPrice()));

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

@@ -280,6 +280,36 @@ public class ShopServiceImpl implements ShopService {
         product.setQualificationNo(productDto.getQualificationNo());
         product.setProductName(productDto.getProductName());
         product.setQualificationTime(productDto.getQualificationTime());
+        //根据商品类型给价格可见度、商品可见度、商品内容可见度赋值
+        //械字号
+        if (productDto.getProductType() == 2) {
+            //一类
+            if (productDto.getMachineType() == 1) {
+                product.setPriceFlag(0);
+                product.setVisibility(3);
+                product.setCommodityDetailsFlag(1);
+                //二类
+            } else if (productDto.getMachineType() == 2) {
+                product.setPriceFlag(3);
+                product.setVisibility(3);
+                product.setCommodityDetailsFlag(4);
+                //三类
+            } else if (productDto.getMachineType() == 3) {
+                product.setPriceFlag(3);
+                product.setVisibility(3);
+                product.setCommodityDetailsFlag(4);
+                //异常情况赋值
+            } else {
+                product.setPriceFlag(0);
+                product.setVisibility(3);
+                product.setCommodityDetailsFlag(1);
+            }
+            //其他字号商品
+        } else {
+            product.setPriceFlag(2);
+            product.setVisibility(3);
+            product.setCommodityDetailsFlag(1);
+        }
         //设置主图
         for (Map<String, String> map : imageList) {
             String mainFlag = map.get("mainFlag");
@@ -296,10 +326,8 @@ public class ShopServiceImpl implements ShopService {
             product.setFeaturedFlag(0);
             product.setCostCheckFlag(1);
             product.setRecommendType(0);
-            product.setPriceFlag(2);
             product.setActFlag(0);
             product.setLadderPriceFlag(0);
-            product.setVisibility(3);
             log.info("+++++++++++++++++++++++++"+product);
             shopMapper.insertProduct(product);
             if (StringUtils.isBlank(productDto.getProductCode())) {

src/main/resources/mapper/PageMapper.xml

@@ -7,6 +7,12 @@
         where id = #{pageId}
           and enabledStatus = '1'
     </select>
+    <select id="getPageLabel" resultType="java.lang.String">
+        select contentLabel
+        from cm_page
+        where id = #{pageId}
+          and enabledStatus = '1'
+    </select>
     <select id="getHotSearchByPageId" resultType="com.caimei365.commodity.model.vo.HotSearchVo">
         select
         id, pageId, name, isHot, link, pcStatus, sort, appletsStatus, creationTime
@@ -314,6 +320,7 @@
                a.backgroundColour,
                a.backgroundImage,
                a.backgroundImageWay,
+               a.contentLabel,
                a.backgroundType
         from cm_page a
         where a.id = #{id}
@@ -380,6 +387,7 @@
                backgroundColour,
                backgroundImage,
                backgroundImageWay,
+               contentLabel,
                backgroundType
         from cm_page
         where id = #{pageId}

src/main/resources/mapper/SecondHandMapper.xml

@@ -42,7 +42,7 @@
     </insert>
     <insert id="insertShop" keyColumn="shopID" keyProperty="shopId" parameterType="com.caimei365.commodity.model.vo.ShopVo" useGeneratedKeys="true">
         insert into shop (name,linkMan,contractMobile,cardNumber,accountType,banOfDeposit,accountName,addTime,status,shopType)
-        values (#{name},#{linkMan},#{contractMobile},#{cardNumber},#{accountType},#{banOfDeposit},#{accountName},now(),90,3)
+        values (#{name},#{linkMan},#{contractMobile},#{cardNumber},#{accountType},#{banOfDeposit},#{accountName},now(),90,0)
     </insert>
     <update id="updateSecondHandViews">
         UPDATE cm_second_hand_detail SET viewingNum = #{viewingNum}

src/main/resources/mapper/ShopMapper.xml

@@ -48,6 +48,9 @@
         <if test="visibility != null and  visibility != ''">
             visibility,
         </if>
+        <if test="commodityDetailsFlag != null and  commodityDetailsFlag != ''">
+            commodityDetailsFlag,
+        </if>
         <if test="productCode != null and  productCode != ''">
             productCode,
         </if>
@@ -132,6 +135,9 @@
         <if test="visibility != null and  visibility != ''">
             #{visibility},
         </if>
+        <if test="commodityDetailsFlag != null and  commodityDetailsFlag != ''">
+            #{commodityDetailsFlag},
+        </if>
         <if test="productCode != null and  productCode != ''">
             #{productCode},
         </if>
@@ -238,6 +244,9 @@
         <if test="visibility != null and  visibility != ''">
             visibility = #{visibility},
         </if>
+        <if test="commodityDetailsFlag != null and  commodityDetailsFlag != ''">
+            commodityDetailsFlag = #{commodityDetailsFlag},
+        </if>
         <if test="productCode != null and  productCode != ''">
             productCode = #{productCode},
         </if>