订单添加搜索，按照商品订单号搜索

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -170,6 +170,9 @@
                 <if test="salesDealCode !=null and salesDealCode !=''">
                     AND sales_deal_code = #{salesDealCode}
                 </if>
+                <if test="salesExOrderId !=null and salesExOrderId !=''">
+                    AND sales_ex_orderId = #{salesExOrderId}
+                </if>
                 <if test="salesAddressTel !=null and salesAddressTel !=''">
                     AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
                 </if>
@@ -652,6 +655,9 @@
             <if test="salesDealCode !=null and salesDealCode !=''">
                 AND sales_deal_code = #{salesDealCode}
             </if>
+            <if test="salesExOrderId !=null and salesExOrderId !=''">
+                AND sales_ex_orderId = #{salesExOrderId}
+            </if>
             <if test="salesAddressTel !=null and salesAddressTel !=''">
                 AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
             </if>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -143,8 +143,10 @@
             </div>
             <#--Efast add end-->
             <div style="width: 90%;margin-left: 10%;">
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:8.9%;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesOrderId!}" placeholder="订单号" name="salesOrderId" id="salesOrderId">
+                <#--<input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:8.9%;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesOrderId!}" placeholder="订单号" name="salesOrderId" id="salesOrderId">-->
                 <input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:8.9%;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:8.9%;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesDealCode!}" placeholder="第三方订单号" name="salesExOrderId" id="salesExOrderId">
+
                 <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:8.9%;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
 
                 <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:8.9%;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesPostNum!}" placeholder="快递单号" name="salesPostNum" id="salesPostNum">