Ver código fonte

处理订单找不到的bug。
添加mysql连接池的判断

yujia 7 anos atrás
pai
commit
38503a64d4

+ 10 - 6
src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -1652,14 +1652,18 @@ public class OrderServiceImpl implements OrderService {
     @Override
     @Override
     public Order findOrderDetail(String orderid) {
     public Order findOrderDetail(String orderid) {
         Order order = orderDao.findOrderByOrderid(orderid);
         Order order = orderDao.findOrderByOrderid(orderid);
-        if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
-            Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
-            if (enterprise != null) {
-                order.setBuyerentername(enterprise.getEnName());
+        if (order != null) {
+            if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
+                Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
+                if (enterprise != null) {
+                    order.setBuyerentername(enterprise.getEnName());
+                }
             }
             }
+            order.setReceiveName(sysConf.getEnName());
+            return order;
+        } else {
+            throw new IllegalOperatorException("找不到指定的订单");
         }
         }
-        order.setReceiveName(sysConf.getEnName());
-        return order;
     }
     }
 
 
     @Override
     @Override

+ 3 - 1
src/main/resources/dev/jdbc.properties

@@ -8,4 +8,6 @@ jdbc.maxIdle=50
 jdbc.minIdle=1
 jdbc.minIdle=1
 jdbc.suspectTimeout=60
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
 jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
+jdbc.minEvictableIdleTimeMillis=60000
+jdbc.validationQuery=SELECT 1
+jdbc.testWhileIdle=true

+ 3 - 1
src/main/resources/prod/jdbc.properties

@@ -8,4 +8,6 @@ jdbc.maxIdle=50
 jdbc.minIdle=50
 jdbc.minIdle=50
 jdbc.suspectTimeout=60
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
 jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
+jdbc.minEvictableIdleTimeMillis=60000
+jdbc.validationQuery=SELECT 1
+jdbc.testWhileIdle=true

+ 3 - 1
src/main/resources/test/jdbc.properties

@@ -8,4 +8,6 @@ jdbc.maxIdle=50
 jdbc.minIdle=1
 jdbc.minIdle=1
 jdbc.suspectTimeout=60
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
 jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
+jdbc.minEvictableIdleTimeMillis=60000
+jdbc.validationQuery=SELECT 1
+jdbc.testWhileIdle=true