销售提成记录，二手商品管理bugfix

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

@@ -713,9 +713,15 @@
                     <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>
                     <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
                     <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
-                    <c:if test="${order.orderSubmitType != 0 && order.orderType !=0 }">
+                    <c:if test="${order.orderType ==0}" >
                     <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
-                    </c:if>                  <%--包含订单充值商品就不显示--%>
+                </c:if>
+                    <c:if test="${order.orderType !=0}" >
+                        <c:if test="${order.spID!=null}">
+                            <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
+                        </c:if>
+                    </c:if>
+                    <%--包含订单充值商品就不显示--%>
                     <c:if test="${empty order.rechargeGoods}">
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
                             <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>

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

@@ -446,12 +446,12 @@
             <form:input path="fixedYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>
         </div>
     </div>
-    <div class="control-group maturityYears showClassDiv">
-        <label class="control-label"><font color="red">*</font>产品到期日期：</label>
-        <div class="controls">
-            <form:input path="maturityYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>
-        </div>
-    </div>
+<%--    <div class="control-group maturityYears showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>产品到期日期：</label>--%>
+<%--        <div class="controls">--%>
+<%--            <form:input path="maturityYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
     <div class="control-group" id="gsmc">
         <label class="control-label"><font color="red">*</font>公司名称：</label>
         <div class="controls">
@@ -472,30 +472,30 @@
             </label>
         </div>
     </div>
-    <div class="control-group showClassDiv">
-        <label class="control-label"><font color="red">*</font>市场价：</label>
-        <div class="controls">
-            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"
-                   id="normalPrice" name="normalPrice"
-                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.normalPrice}' pattern='0.00'/>"
-                   onkeyup="num(this)" class="input-xlarge"/>
-        </div>
-    </div>
-    <div class="control-group showClassDiv">
-        <label class="control-label"><font color="red">*</font>采购价/原价：</label>
-        <div class="controls">
-            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"
-                   id="originalPrice" name="originalPrice"
-                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.originalPrice}' pattern='0.00'/>"
-                   onkeyup="num(this)" class="input-xlarge"/>
-        </div>
-    </div>
-    <div class="control-group showClassDiv">
-        <label class="control-label"><font color="red">*</font>数量：</label>
-        <div class="controls">
-            <form:input path="stock" htmlEscape="false" class="input-xlarge  number"/>
-        </div>
-    </div>
+<%--    <div class="control-group showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>市场价：</label>--%>
+<%--        <div class="controls">--%>
+<%--            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
+<%--                   id="normalPrice" name="normalPrice"--%>
+<%--                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.normalPrice}' pattern='0.00'/>"--%>
+<%--                   onkeyup="num(this)" class="input-xlarge"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+<%--    <div class="control-group showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>采购价/原价：</label>--%>
+<%--        <div class="controls">--%>
+<%--            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
+<%--                   id="originalPrice" name="originalPrice"--%>
+<%--                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.originalPrice}' pattern='0.00'/>"--%>
+<%--                   onkeyup="num(this)" class="input-xlarge"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+<%--    <div class="control-group showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>数量：</label>--%>
+<%--        <div class="controls">--%>
+<%--            <form:input path="stock" htmlEscape="false" class="input-xlarge  number"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>成本：</label>
         <div class="controls">