bug修复

src/main/java/com/caimei/controller/search/SearchController.java

@@ -129,7 +129,7 @@ public class SearchController {
             CmMallOrder order = new CmMallOrder();
             CopyUtil.copyProperties(order, orderList.get(i));
             //111,待付待收待发
-            if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
+            if ("11".equals(order.getStatus()) && "1".equals(order.getPayStatus())) {
                 order.setStatus("111");
             }
             String[] ShopOrderIDs = {};

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -244,7 +244,7 @@ public class OrderServiceImpl implements OrderService {
         if (order == null) throw new Exception("该订单已删除");
         order.setOrderMark("#" + order.getOrderID() + "#");
         //111,待付待收待发
-        if ("11".equals(order.getStatus()) && order.getPayStatus().equals("1")) {
+        if ("11".equals(order.getStatus()) && "1".equals(order.getPayStatus())) {
             order.setStatus("111");
         }
         //判断交易全退情况下,是否发过货,77,交易全退可以查看物流
@@ -862,7 +862,7 @@ public class OrderServiceImpl implements OrderService {
         List<CmMallOrder> orderList = orderMapper.findAllOrder(userID, orderState, organizeID);
         for (CmMallOrder order : orderList) {
             //111,待付待收待发
-            if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
+            if ("11".equals(order.getStatus()) && "1".equals(order.getPayStatus())) {
                 order.setStatus("111");
             }
             String[] ShopOrderIDs = {};
@@ -960,7 +960,7 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void cancelOrder(Integer orderID) throws Exception {
         CmMallOrder order = orderMapper.findOrder(orderID);
-        if (order == null) throw new Exception("订单不存在");
+        if (order == null) { throw new Exception("订单不存在"); }
         if (!("11".equals(order.getStatus()))) {
             throw new Exception("订单异常");
         }
@@ -971,13 +971,13 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void affirmCargo(Integer orderID) throws Exception {
         CmMallOrder order = orderMapper.findOrder(orderID);
-        if (order == null) throw new Exception("订单不存在");
-        if (order.getStatus().equals("33") && order.getPayStatus().equals("3")) {
+        if (order == null) { throw new Exception("订单不存在"); }
+        if ("33".equals(order.getStatus()) && "3".equals(order.getPayStatus())) {
             //已付款供应商,订单完成
             order.setStatus("5");
             orderMapper.update(order);
             orderMapper.updateLogisticsBatch(orderID);
-        } else if (order.getStatus().equals("33")) {
+        } else if ("33".equals(order.getStatus())) {
             //交易完成
             order.setStatus("4");
             orderMapper.update(order);