bugfix

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

@@ -187,7 +187,7 @@ public class Product extends DataEntity<Product> {
     /**
      * 普通机构商品详情
      */
-    private String detailInfo2;
+    private String commonDetailInfo;
     /**
      * 服务详情
      */
@@ -215,12 +215,12 @@ public class Product extends DataEntity<Product> {
         this.productDetail = productDetail;
     }
 
-    public String getDetailInfo2() {
-        return detailInfo2;
+    public String getCommonDetailInfo() {
+        return commonDetailInfo;
     }
 
-    public void setDetailInfo2(String detailInfo2) {
-        this.detailInfo2 = detailInfo2;
+    public void setCommonDetailInfo(String commonDetailInfo) {
+        this.commonDetailInfo = commonDetailInfo;
     }
 
     public List<ProductLadderPrice> getLadderPriceList() {

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

@@ -25,7 +25,7 @@ public class ProductDetailInfo implements Serializable {
     /**
      * 普通机构商品详情信息
      */
-    private String detailInfo2;
+    private String commonDetailInfo;
 
     private String detailInfoTxt;
 
@@ -47,12 +47,12 @@ public class ProductDetailInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public String getDetailInfo2() {
-        return detailInfo2;
+    public String getCommonDetailInfo() {
+        return commonDetailInfo;
     }
 
-    public void setDetailInfo2(String detailInfo2) {
-        this.detailInfo2 = detailInfo2;
+    public void setCommonDetailInfo(String commonDetailInfo) {
+        this.commonDetailInfo = commonDetailInfo;
     }
 
     public Integer getProductDetailInfoID() {

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -364,7 +364,6 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public void saveProduct(Product product, ProductDetailInfo productDetailInfo) {
         String detailInfo = product.getDetailInfo();
         String orderInfo = product.getOrderInfo();
-        String detailInfo2 = product.getDetailInfo2();
         String serviceInfo = product.getServiceInfo();
         List<ProductLadderPrice> ladderPriceList = product.getLadderPriceList();
         // 上传商品图片

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

@@ -253,7 +253,7 @@ public class ProductNewController extends BaseController {
                 product.setDetailInfo(productDetailInfo.getDetailInfo());
                 product.setServiceInfo(productDetailInfo.getServiceInfo());
                 product.setOrderInfo(productDetailInfo.getOrderInfo());
-                product.setDetailInfo2(productDetailInfo.getDetailInfo2());
+                product.setCommonDetailInfo(productDetailInfo.getCommonDetailInfo());
             }
             product.setLadderPriceList(ladderPriceList);
             product.setProductDetail(productService.findProductDetail(product.getProductID()));

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

@@ -1619,8 +1619,8 @@
       <if test="detailInfo != null">
         detailInfo = #{detailInfo},
       </if>
-	  <if test="detailInfo2 != null">
-			detailInfo2 = #{detailInfo2},
+	  <if test="commonDetailInfo != null">
+		  commonDetailInfo = #{commonDetailInfo},
 	  </if>
       <if test="detailInfoTxt != null">
         detailInfoTxt = #{detailInfoTxt},

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

@@ -575,9 +575,9 @@
         <tr>
             <th><span class="red">*</span>普通机构商品详细信息：</th>
             <td colspan="3">
-                <form:textarea path="detailInfo2" htmlEscape="false" class="input-xlarge required hide"/>
+                <form:textarea path="commonDetailInfo" htmlEscape="false" class="input-xlarge required hide"/>
                 <!-- 富文本编辑器 -->
-                <div id="detailInfoEditor2">${product.detailInfo2==""||product.detailInfo2==null?"若要查看更多产品信息，请注册机构会员，如有疑问请联系客服。":product.detailInfo2}</div>
+                <div id="detailInfoEditor2">${product.commonDetailInfo==""||product.commonDetailInfo==null?"若要查看更多产品信息，请注册机构会员，如有疑问请联系客服。":product.commonDetailInfo}</div>
             </td>
         </tr>
         <tr>
@@ -852,8 +852,8 @@
     function checkInfo() {
         var detailInfo = detailInfoEditor.getData();
         $("#detailInfo").val(detailInfo);
-        var detailInfo2 = detailInfoEditor2.getData();
-        $("#detailInfo2").val(detailInfo2);
+        var commonDetailInfo = detailInfoEditor2.getData();
+        $("#commonDetailInfo").val(commonDetailInfo);
         console.log(detailInfo);
         var orderInfo = orderInfoEditor.getData();
         $("#orderInfo").val(orderInfo);