修改销售查询语句

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1596,9 +1596,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Map<String, Object> mesMap = new HashMap<>();
         switch (orderType){
             case 1:
+            case 2:
                 mesMap = omstruckOrderMapper.getXSOrderMessageToApp(map);
                 break;
-            case 2:
             case 3:
             case 4:
                 mesMap = omstruckOrderMapper.getFYJHOrderMessageToApp(map);
@@ -1616,6 +1616,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
             case 13:
+            case 15:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
                 break;
 
@@ -1637,8 +1638,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         List<Map<String, Object>> mesMapList = new ArrayList<>();
         for (Map<String, Object> orderMesMap: orderMesList) {
             //如果订单类型为2 则判断订单发货日期是否为当日 如果不是当日则不给显示
-            if(DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 2){
-                Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDate(map.get("orderId"));
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 2){
+                Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDate(orderMesMap.get("orderId"));
                 if(judgeDate == null){ // 数据为空则不是当天的订单
                     continue;
                 }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -1684,7 +1684,7 @@
                 and RC.CARRIER_ID = #{carrierId}
             </if>
             <if test="orderTypee!=null">
-                and OO.ORDER_TYPE=#{orderTypee}
+                and OO.ORDER_TYPE in (1, 2)
             </if>
         </where>
         )