Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

src/main/java/com/steerinfo/dil/service/IAmstruckSporadicOrderService.java

@@ -51,11 +51,11 @@ public interface IAmstruckSporadicOrderService {
     //一车多趟运输顶单排车
     int addSporadicOrderforTimes(Map<String,Object> map);
 
-    //普通零星停止
-    int closeSporadicOrderInward(Map<String,Object> map);
-
-    //一车多趟停止
-    int closeSporadicOrder(Map<String,Object> map);
+//    //普通零星停止
+//    int closeSporadicOrderInward(Map<String,Object> map);
+//
+//    //一车多趟停止
+//    int closeSporadicOrder(Map<String,Object> map);
 
     //停止
     int closeSporadic(Map<String,Object> map);

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

@@ -488,75 +488,55 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
 
         return result;
     }
-    //内转零星停止
-    @Override
-    public int closeSporadicOrderInward(Map<String, Object> map) {
-        int result=0;
-        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
-        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
-        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
-        amstruckSporadicOrder.setTransStatus(new BigDecimal(0));
-        result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
-        //查找零星订单下的所有未接收的运输订单
-        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
-        for (Map<String,Object> map1:stringObjectMap) {
-            //获取零星订单关联的未接收的订单
-            BigDecimal orderId =(BigDecimal) map1.get("orderId");
-            OmstruckOrder omstruckOrder=new OmstruckOrder();
-            omstruckOrder.setOrderId(orderId);
-            omstruckOrder.setOrderStatus(new BigDecimal(8));
-            result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        }
-        return result;
 
-    }
 
-    //关闭零星订单,将订单吗状态设置为0  无法推送新的订单。
+//    //内转零星停止
+//    @Override
+//    public int closeSporadicOrderInward(Map<String, Object> map) {
+//        int result=0;
+//        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
+//        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+//        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
+//
+//        result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+//        //查找零星订单下的所有未接收的运输订单
+//        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
+//        for (Map<String,Object> map1:stringObjectMap) {
+//            //获取零星订单关联的未接收的订单
+//            BigDecimal orderId =(BigDecimal) map1.get("orderId");
+//            OmstruckOrder omstruckOrder=new OmstruckOrder();
+//            omstruckOrder.setOrderId(orderId);
+//            omstruckOrder.setOrderStatus(new BigDecimal(8));
+//            result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+//        }
+//        return result;
+//
+//    }
+
+
     @Override
-    public int closeSporadicOrder(Map<String, Object> map) {
-        int result=0;
-        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
-        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+    public int closeSporadic(Map<String, Object> map) {
+        int result = 0;
+        BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
+        AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
         amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
         amstruckSporadicOrder.setSporadicOrderTimes(new BigDecimal(0));
-        result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+        amstruckSporadicOrder.setTransStatus(new BigDecimal(0));
+        result += amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
         //查找零星订单下的所有未接收的运输订单
         List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
-        for (Map<String,Object> map1:stringObjectMap) {
+        for (Map<String, Object> map1 : stringObjectMap) {
             //获取零星订单关联的未接收的订单
-            BigDecimal orderId =(BigDecimal) map1.get("orderId");
-            OmstruckOrder omstruckOrder=new OmstruckOrder();
+            BigDecimal orderId = (BigDecimal) map1.get("orderId");
+            //获取零星订单关联的未接收的订单
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderStatus(new BigDecimal(8));
-           result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+
         }
         return result;
     }
+}
 
-    @Override
-    public int closeSporadic(Map<String, Object> map) {
-        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
-        //查找零星订单下的所有未接收的运输订单
-        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
-        for (Map<String,Object> map1:stringObjectMap){
-            //获取零星订单关联的未接收的订单
-            BigDecimal orderId =(BigDecimal) map1.get("orderId");
-            //根据运输订单id查找运输订单类型
-            int orderType = omstruckOrderMapper.selectOrderTypeByOrderId(orderId);
-            switch (orderType){
-                case 15:
-                case 16:
-                         //普通零星
-                         closeSporadicOrder(map);
-                         break;
-                case 12:
-                case 13:
-                         //内转零星
-                         closeSporadicOrderInward(map);
-                         break;
 
-            }
-        }
-        return 2;
-    }
-}