From 2e282edbf809fc1d94ff420c58036733c0a542b7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 四月 2022 11:47:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/CoolExceptionHandler.java | 6 +++---
version/doc/商品档案Excel导入模板.xlsx | 0
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 7 +++----
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 1 -
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index d7b397b..58d6f25 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -291,7 +291,7 @@
}
String response;
try {
- response = new HttpHandler.Builder()
+ response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
.setPath(MesConstant.PACK_DOWN_URL)
.setJson(JSON.toJSONString(mesCombParam))
@@ -300,7 +300,7 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
log.info("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛�");
- } else if (jsonObject.getInteger("code").equals(500)) {
+ } else if (jsonObject.getInteger("code").equals(500)) {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
throw new CoolException(jsonObject.getString("msg"));
} else {
@@ -309,8 +309,7 @@
}
} catch (Exception e) {
log.error("fail", e);
- e.printStackTrace();
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ throw new CoolException(e.getMessage());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 8dd523a..e611ccf 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -67,7 +67,6 @@
}
} catch (Exception e) {
log.error("fail", e);
- e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
}
diff --git a/src/main/java/com/zy/common/config/CoolExceptionHandler.java b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
index 851ab72..5d7e928 100644
--- a/src/main/java/com/zy/common/config/CoolExceptionHandler.java
+++ b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
@@ -27,10 +27,10 @@
@ExceptionHandler(CoolException.class)
public R handleRRException(CoolException e) {
String[] split = e.getMessage().split("-");
- if (split.length > 2) {
- return R.error(e.getMessage());
+ if (split.length == 2) {
+ return R.parse(e.getMessage());
}
- return R.parse(e.getMessage());
+ return R.error(e.getMessage());
}
}
diff --git "a/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
new file mode 100644
index 0000000..0cfdac9
--- /dev/null
+++ "b/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.1