供应商发布商品可见度规则调整

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/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/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/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>