bugfix

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

@@ -296,11 +296,14 @@ public class ProductNewController extends BaseController {
     public String editProduct(Product product, Model model) {
         if (null != product.getProductID()) {
             ProductDetailInfo productDetailInfo = productService.getProductDetailInfo(product.getProductID());
-            Product produ=productService.qualification(product.getProductID());
-            product.setQualificationLink(produ.getQualificationLink());
-            product.setQualificationNo(produ.getQualificationNo());
-            product.setQualificationTime(produ.getQualificationTime());
-            product.setProductName(produ.getProductName());
+//            Product produ=productService.qualification(product.getProductID());
+//            if(null != produ){
+//                product.setQualificationLink(produ.getQualificationLink());
+//                product.setQualificationNo(produ.getQualificationNo());
+//                product.setQualificationTime(produ.getQualificationTime());
+//                product.setProductName(produ.getProductName());
+//            }
+
             List<ProductLadderPrice> ladderPriceList = productService.findLadderPrice(product.getProductID());
             if (null != productDetailInfo) {
                 product.setDetailInfo(productDetailInfo.getDetailInfo());

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

@@ -92,7 +92,12 @@
         a.showFlag,
         a.showTime,
         a.newshowTime,
-        a.recommend
+        a.recommend,
+		a.qualificationNo,
+		a.productName,
+		a.qualificationTime,
+		a.qualificationLink
+
     </sql>
 
 	<sql id="productJoins">

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

@@ -543,7 +543,7 @@
             <td colspan="3">
 <%--                <form:input path="qualificationTime" type="text" maxlength="20" class="input-medium Wdate" value="${product.qualificationTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>--%>
                 <form:input path="qualificationTime" type="text" maxlength="10" class="input-medium Wdate"
-                            value="${startConfirmTime}"
+                            value="${qualificationTime}"
                             onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
             </td>
         </tr>