bug fixes

src/main/java/com/caimei/controller/order/OrderController.java

@@ -166,8 +166,7 @@ public class OrderController {
         HttpSession session = request.getSession();
         String openid = (String) session.getAttribute("openid");
         Integer organizeID1 = (Integer) session.getAttribute("organizeID");
-        CmOperationUser currentUser = loginService.doLogin("oEjHd4gCC7SO5Eo3ogt5g4pj2mNU", 1);
-//        CmOperationUser currentUser = loginService.doLogin(openid, organizeID1);
+        CmOperationUser currentUser = loginService.doLogin(openid, organizeID1);
         if (null == currentUser) {
             return wxJsonModel.error("-1", "用户账户异常");
         }

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

@@ -171,7 +171,7 @@ public class OrderServiceImpl implements OrderService {
                                        Integer organizeID) {
         WxJsonModel model = WxJsonModel.newInstance();
         CmOrder order = orderMapper.findOrder(orderID);
-        if (order == null) return model.error("该订单已删除");
+        if (order == null) return model.error("-2", "该订单已删除");
         CmOperationUser operationUser = loginMapper.doLogin(openid, organizeID);
         if (operationUser != null && operationUser.getUserID().equals(userID)) {
             return model.success(true);