zhijiezhao 6 bulan lalu
induk
melakukan
62a0963e69

+ 2 - 2
src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -397,11 +397,11 @@ public class CmSecondHandDetailController extends BaseController {
         if (null != stock && stock > 0) {
             cmSku.setStock(String.valueOf(stock));
         }
-        String normalPrice = "0";
+        String normalPrice = cmSecondHandDetail.getNormalPrice();
         if (StringUtils.isNotEmpty(normalPrice)) {
             cmSku.setNormalPrice(Double.parseDouble(normalPrice));
         }
-        cmSku.setPrice(0d);
+        cmSku.setPrice(cmSecondHandDetail.getPrice());
         cmSku.setCostCheckFlag(1);
         cmSku.setCostPrice(0d);
 //        if ("1".equals(cmSecondHandDetail.getCostCheckFlag())) {

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp

@@ -130,7 +130,7 @@
         <th>卖家</th>
 <%--        <th>采美对接人</th>--%>
         <th>来源</th>
-<%--        <th>交易价</th>--%>
+        <th>交易价</th>
 <%--        <th>线上分帐号</th>--%>
 <%--        <th>发布类型</th>--%>
         <th>分类</th>
@@ -205,7 +205,7 @@
                     小程序-协销
                 </c:if>
             </td>
-<%--            <td>${product.price}</td>--%>
+            <td>${product.price}</td>
 <%--            <td>--%>
 <%--                    ${product.splitCode}--%>
 <%--            </td>--%>

+ 19 - 19
src/main/webapp/WEB-INF/views/modules/product/cmSecondDetailForm.jsp

@@ -58,11 +58,11 @@
                     //     }
                     // }
 
-                    // var price = $("#price").val();
-                    // if (0 == price) {
-                    //     alertx('交易价不能为0');
-                    //     return false;
-                    // }
+                    var price = $("#price").val();
+                    if (0 == price) {
+                        alertx('交易价不能为0');
+                        return false;
+                    }
 
                     var secondHandType = $("input[name ='secondHandType']:checked").val();
                     if (secondHandType == 2) {
@@ -433,20 +433,20 @@
             <form:input path="companyName" htmlEscape="false" maxlength="20" class="input-xlarge "/>
         </div>
     </div>
-<%--    <div class="control-group">--%>
-<%--        <label class="control-label"><font color="red">*</font>交易价:</label>--%>
-<%--        <div class="controls">--%>
-<%--            <form:input path="price" htmlEscape="false" maxlength="11" onkeyup="num(this)"--%>
-<%--                        class="input-xlarge required"/>--%>
-<%--            <label>--%>
-<%--                <input id="detailTalkFlag" name="detailTalkFlag" type="hidden"/>--%>
-<%--                <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
-<%--                       id="detailTalk" name="detailTalk" type="checkbox" onclick="detailTalkFlagCheckd()"--%>
-<%--                       <c:if test="${cmSecondHandDetail.detailTalkFlag eq 2}">checked="checked"</c:if> /><font--%>
-<%--                    color="red">价格详聊</font>(勾选代表同意不显示交易价)--%>
-<%--            </label>--%>
-<%--        </div>--%>
-<%--    </div>--%>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>交易价:</label>
+        <div class="controls">
+            <form:input path="price" htmlEscape="false" maxlength="11" onkeyup="num(this)"
+                        class="input-xlarge required"/>
+            <label>
+                <input id="detailTalkFlag" name="detailTalkFlag" type="hidden"/>
+                <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"
+                       id="detailTalk" name="detailTalk" type="checkbox" onclick="detailTalkFlagCheckd()"
+                       <c:if test="${cmSecondHandDetail.detailTalkFlag eq 2}">checked="checked"</c:if> /><font
+                    color="red">价格详聊</font>(勾选代表同意不显示交易价)
+            </label>
+        </div>
+    </div>
 
 <%--    <div class="control-group">--%>
 <%--        <label class="control-label"><font color="red">*</font>成本:</label>--%>