二手商品修改

src/main/java/com/caimei/modules/product/entity/CmSecondHandDetail.java

@@ -91,6 +91,7 @@ public class CmSecondHandDetail extends DataEntity<CmSecondHandDetail> {
     private String image4;
     private String image5;
     private String editFlag;//编辑标记，1是编辑，其他都不是
+    private String visibility;     //商品可见度：（3:所有人可见，2:普通机构可见，1:会员机构可见）
 
 
     public CmSecondHandDetail() {
@@ -662,4 +663,12 @@ public class CmSecondHandDetail extends DataEntity<CmSecondHandDetail> {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getVisibility() {
+        return visibility;
+    }
+
+    public void setVisibility(String visibility) {
+        this.visibility = visibility;
+    }
 }

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -119,17 +119,17 @@ public class CmSecondHandDetailController extends BaseController {
         // 构造类型
         List<BigType> typeList = new ArrayList<>();
         BigType bigType = new BigType();
-        BigType bigType1 = new BigType();
-        BigType bigType2 = new BigType();
+        /*BigType bigType1 = new BigType();
+        BigType bigType2 = new BigType();*/
         bigType.setId("1");
-        bigType.setName("轻光电");
-        bigType1.setId("2");
+        bigType.setName("美容仪器");
+/*        bigType1.setId("2");
         bigType1.setName("重光电");
         bigType2.setId("3");
-        bigType2.setName("耗材配件");
+        bigType2.setName("耗材配件");*/
         typeList.add(bigType);
-        typeList.add(bigType1);
-        typeList.add(bigType2);
+        /*typeList.add(bigType1);
+        typeList.add(bigType2);*/
         model.addAttribute("typeList", typeList);
 
         //初始化城市信息
@@ -213,6 +213,7 @@ public class CmSecondHandDetailController extends BaseController {
         product.setShopID(1252);
         product.setName(cmSecondHandDetail.getName());
         product.setAliasName(cmSecondHandDetail.getName());
+        product.setVisibility(cmSecondHandDetail.getVisibility());
         String normalPrice = cmSecondHandDetail.getNormalPrice();
         if (StringUtils.isNotEmpty(normalPrice)) {
             product.setNormalPrice(Float.parseFloat(normalPrice));

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -191,10 +191,10 @@ public class ProductNewController extends BaseController {
                     String instrumentType = p.getInstrumentType();
                     if (StringUtils.isNotEmpty(instrumentType)) {
                         if (instrumentType.contains(",")) {
-                            String replace = instrumentType.replace(",", "-").replace("1", "轻光电").replace("2", "重光电").replace("3", "耗材配件");
+                            String replace = instrumentType.replace(",", "-").replace("1", "美容仪器");
                             p.setInstrumentType(replace);
                         } else {
-                            p.setInstrumentType("1".equals(p.getInstrumentType()) ? "轻光电" : "2".equals(p.getInstrumentType()) ? "重光电" : "3".equals(p.getInstrumentType()) ? "耗材配件" : "其他");
+                            p.setInstrumentType("1".equals(p.getInstrumentType()) ? "美容仪器" : "");
                         }
                     }
                 }

src/main/resources/mappings/modules/product/CmSecondHandDetailMapper.xml

@@ -49,7 +49,8 @@
 		p.brandID AS "brandID",
 		p.costPrice as "costPrice",
 		p.costCheckFlag AS "costCheckFlag",
-		p.costProportional AS "costProportional"
+		p.costProportional AS "costProportional",
+		p.visibility AS "visibility"
 	</sql>
 
 	<sql id="cmSecondHandDetailJoins">

src/main/webapp/WEB-INF/views/modules/product/cmSecondHandDetailForm.jsp

@@ -344,7 +344,16 @@
 			<form:checkboxes path="bigTypeList"  items="${typeList}" itemLabel="name" itemValue="id" htmlEscape="false" class="input-small  stylema required"/>
 		</div>
 	</div>
-
+	<div class="control-group">
+		<label class="control-label"><font color="red">*</font>商品可见度：</label>
+		<div class="controls">
+			<form:select path="visibility" class="input-large required" id="visibility">
+				<form:option value="3" label="所有人可见"/>
+				<form:option value="2" label="所有机构可见"/>
+				<form:option value="1" label="仅会员机构可见"/>
+			</form:select>
+		</div>
+	</div>
 	<div class="control-group">
 		<label class="control-label"><font color="red">*</font>商品品牌：</label>
 		<div class="controls">