yujian
2019-08-01 c22963a2ee796e59094524cadc5a78c450ed98f8
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
@@ -85,16 +85,16 @@
                  && order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
               // 申诉成功
               json.put("state", 1);
               json.put("stateDesc", "申诉成功,请在订单列表中查看");
               json.put("stateDesc", "订单找回成功,请我的-订单中查看");
            } else if (order.getState() == 2 || (order.getState() == 1 && order.getResultCode() != null
                  && order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {
               // 申诉失败
               json.put("state", 2);
               json.put("stateDesc", "申诉失败");
               json.put("stateDesc", "订单找回失败");
            } else {
               // 处理中
               json.put("state", 0);
               json.put("stateDesc", "审核中");
               json.put("stateDesc", "订单找回中");
            }
            data.add(json);
         }
@@ -138,14 +138,37 @@
   @RequestMapping("findLostOrder")
   public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, HttpServletRequest request, PrintWriter out) {
      Integer type = lostOrder.getType();
      if (type == null) {
         type = Constant.SOURCE_TYPE_TAOBAO;
      }
      boolean orderNum = true;
      if (!NumberUtil.isNumeric(lostOrder.getOrderId())) {
         orderNum = false;
      } else if (lostOrder.getOrderId().length() < 12 || lostOrder.getOrderId().length() > 20) {
         orderNum = false;
      } else
         orderNum = Utils.isOrderNum(lostOrder.getOrderId());
      String orderId = lostOrder.getOrderId();
      if (type == Constant.SOURCE_TYPE_TAOBAO) {
         if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 12 || orderId.length() > 20)) {
            orderNum = false;
         } else {
            orderNum = Utils.isOrderNum(orderId);
         }
      } else if  (type == Constant.SOURCE_TYPE_JD) {
         if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 6 || orderId.length() > 20)) {
            orderNum = false;
         }
      } else if (type == Constant.SOURCE_TYPE_PDD) {
         if (!orderId.contains("-")) {
            orderNum = false;
         } else {
            String[] split = orderId.split("-");
            if (split == null || split.length != 2) {
               orderNum = false;
            } else {
               if (!NumberUtil.isNumeric(split[0]) || !NumberUtil.isNumeric(split[1])) {
                  orderNum = false;
               }
            }
         }
      }
      if (lostOrder.getUserInfo() == null || lostOrder.getUserInfo().getId() == null
            || lostOrder.getUserInfo().getId() <= 0) {