bugfix

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -17,6 +17,7 @@ public interface ProductDao extends CrudDao<Product> {
     List<ActType> getAllActType();
 
 
+
     int saveSort(@Param("sort") String sort, @Param("id") String id);
 
     int findLadderPriceByNum(@Param("productID") String productID);

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

@@ -537,8 +537,8 @@
 						   costProportional = #{costProportional},
 						   costCheckFlag = #{costCheckFlag},
 						   precisehKey = #{precisehKey},
-						   actSort = #{actSort}.
-# 			               announType-1
+						   actSort = #{actSort},
+						   newvalidFlag=#{newvalidFlag}
 
 		WHERE productID = #{id}
 	</update>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -592,7 +592,7 @@
                 <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
                 <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
                     <shiro:hasPermission name="order:cmPayShop:modifyPay">
-                        <a id="applypayWay"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
+                        <a onclick="applypayWay(${s.shopReceiptStatus},${s.payWay})"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
                     </shiro:hasPermission>
                 </c:if>
                 <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
@@ -693,6 +693,10 @@
 <div class="pagination">${page}</div>
 
 <script>
+
+
+
+
     (function () {
         var payTableEle = $('.pay-table'),
             payProductEle = $('.pay-product-item');
@@ -899,21 +903,17 @@
             window.location.href = '${ctx}/order/cmPayShop/applyEdit' + params;
         });
 
-        //付第三方
-
-        $('#applypayWay').on('click', function () {
-
-            var shopReceiptStatus=$('#shopReceiptStatus').val();
-            var payWay=$('#payWay').val();
+        //线上支付的子订单不能直接修改成本
+        function applypayWay(shopReceiptStatus,payWay) {
             console.log(payWay)
-            debugger
             console.log(shopReceiptStatus)
-
-             if (payWay == 1 && shopReceiptStatus==2) {
-                alertx('线上支付的子订单不能直接修改成本！');
+            if (payWay == 1 && shopReceiptStatus==2) {
+                alertx('线上支付的子订单不能直接修改成本！')
                 return false;
-             }
-            });
+            }
+
+        }
+
 
             $('#applyShopOtherFee').on('click', function () {
             if (checked.length > 1) {

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

@@ -255,7 +255,7 @@
                             <a href="${ctx}/product/cmSecondHandDetail/form?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}&editFlag=${editFlag}">商品编辑</a>
                         </c:if>
                             <c:if test="${product.announType eq 2}">
-                                <a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm?id=7214&searchProductCategory=2&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">编辑</a>
+                                <a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm?id=${product.id}&searchProductCategory=2&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">商品编辑</a>
                                 <a href="${ctx}/product/cmSecondHandDetail/form?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}&editFlag=${editFlag}">转为预成交商品</a>
 <%--                                <a href="${ctx}/product/cmSecondHandDetail/form?searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">转为预成交商品</a>--%>
                             </c:if>

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

@@ -403,7 +403,7 @@
         <label class="control-label"><font color="red">*</font>商品品牌：</label>
         <div class="controls">
             <form:select path="brandID" class="input-medium required">
-                <form:option value=" ">请选择</form:option>
+                <form:option value="">请选择</form:option>
                 <c:forEach items="${brandList}" var="brand">
                     <form:option value="${brand.id}">${brand.name}</form:option>
                 </c:forEach>

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

@@ -592,15 +592,15 @@
         <form:input path="townId" Id="townId" type="hidden" value="${cmSecondHandDetail.townId}"/>
         <label class="control-label"><font color="red">*</font>联系地址：</label>
         <div>
-            <form:select path="province" class="input-xlarge required" id="province"
+            <form:select path="province" class="input-xlarge " id="province"
                          onchange="loadCity()" style="width:100px;">
                 <form:option value="" label="省" provinceId=""/>
             </form:select>&nbsp;&nbsp;
-            <form:select path="city" class="input-xlarge required" id="city" onchange="loadTown()"
+            <form:select path="city" class="input-xlarge " id="city" onchange="loadTown()"
                          style="width:100px;">
                 <form:option value="" label="市" cityId=""/>
             </form:select>&nbsp;&nbsp;
-            <form:select path="town" class="input-xlarge required" id="town" style="width:100px;">
+            <form:select path="town" class="input-xlarge " id="town" style="width:100px;">
                 <form:option value="" label="区"/>
             </form:select>&nbsp;&nbsp;
             <form:input path="address" htmlEscape="false" maxlength="100" class="input-xlarge required"/>