修改撤单接口

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

@@ -586,13 +586,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        if((DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4)
-                && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
-            throw new Exception("钢材订单不允许撤销!");
-        }
-        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
+        //if((DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4)
+        //        && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
+        //    throw new Exception("钢材订单不允许撤销!");
+        //}
+        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1 && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
             throw new Exception("撤单失败");
         }
+        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //获取运输订单号
         String orderNumber = (String) mesMap.get("orderNumber");
         //撤销订单的同时删除计量数据
@@ -601,12 +602,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String jsonData = getRequestUtils.doGet(sendUrl);
         System.out.println(jsonData);
         BigDecimal orderPlanId = DataChange.dataToBigDecimal(mesMap.get("orderPlanId"));
-        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(7));
-        if(DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
+        if(orderType == 1) {
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
+        }
+        if (DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
             omstruckOrder.setOrderStatus(new BigDecimal(4));
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file,stdout, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout