From bd9b339b8507bebd3fbbb4ed6c84faeb8637e748 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 07 一月 2026 09:52:53 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 492bd97..655ff2e 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -82,12 +82,12 @@
* @date 2025/11/24 14:49
*/
@Override
- public XSR receiveOrders(List<PubOrderParams> orderParams) {
+ public XSR receiveOrders(List<PubOrderParams> orderParams, String type) {
orderParams.forEach(params -> {
if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
throw new CoolException("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
}
- addOrUpdateOrders(params, "add");
+ addOrUpdateOrders(params, type);
});
return XSR.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
@@ -179,7 +179,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams) {
+ public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams, String type) {
if (Objects.isNull(pubOrderParams) || pubOrderParams.isEmpty()) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -195,7 +195,7 @@
throw new CoolException("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
- addOrUpdateOrders(params, "add");
+ addOrUpdateOrders(params, type);
});
return XSR.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
@@ -356,6 +356,9 @@
/** 涓嶅瓨鍦紝鏂板璁㈠崟 */
generateOrders(params);
} else {
+ if (order.getSettle() == 2) {
+ throw new CoolException("璁㈠崟宸插鐞嗭紝涓嶅彲鍐嶅彉鏇达紒锛�");
+ }
/** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
// 鍒犻櫎鏃ц鍗曟槑缁�
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
@@ -589,22 +592,22 @@
if (Objects.isNull(response) || response.trim().isEmpty()) {
return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
}
- JSONObject jsonObject = JSONObject.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (!Objects.isNull(code) && code.equals(200)) {
-// if (!Objects.isNull(order)) {
-// order.setReportOnce(5);
-// orderService.updateById(order);
-// }
+ XSR jsonObject = JSONObject.parseObject(response, XSR.class);
+ if (jsonObject.getSuccess()) {
+ if (!Objects.isNull(order)) {
+ order.setReportOnce(5);
+ order.setSettle(5L);
+ checkOrderService.updateById(order);
+ }
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
} else {
-// if (!Objects.isNull(order)) {
-// int reportOnce = order.getReportOnce();
-// reportOnce ++;
-// order.setReportOnce(reportOnce);
-// orderService.updateById(order);
-// }
- String msg = jsonObject.getString("message");
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce ++;
+ order.setReportOnce(reportOnce);
+ checkOrderService.updateById(order);
+ }
+ String msg = jsonObject.getMessage();
return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
}
} catch (Exception e) {
@@ -618,6 +621,59 @@
return XSR.error(e.getMessage());
}
// return null;
+ }
+
+ /**
+ * 澶囪揣鍗曞弽棣�
+ * @param params
+ * @param order
+ * @return
+ */
+ @Override
+ public XSR getOutDetailsResult(List<StockUpOrderParams> params, Order order) {
+ if (Objects.isNull(params)) {
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ String response = null;
+
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url + ":" + port)
+ .setPath(prefix + "/getOutDetailsResult")
+ .setJson(JSONObject.toJSONString(params))
+ .build()
+ .doPost();
+ if (Objects.isNull(response) || response.trim().isEmpty()) {
+ return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
+ }
+ JSONObject jsonObject = JSONObject.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (!Objects.isNull(code) && code.equals(200)) {
+ if (!Objects.isNull(order)) {
+ order.setReportOnce(5);
+ orderService.updateById(order);
+ }
+ return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
+ } else {
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce ++;
+ order.setReportOnce(reportOnce);
+ orderService.updateById(order);
+ }
+ String msg = jsonObject.getString("message");
+ return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
+ }
+ } catch (Exception e) {
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce ++;
+ order.setReportOnce(reportOnce);
+ orderService.updateById(order);
+ }
+ log.error(e.getMessage(), e);
+ return XSR.error(e.getMessage());
+ }
}
/** 鐢熸垚鏂扮殑闆朵欢鎹熸孩鍗�
@@ -647,7 +703,7 @@
order.setSettle(Long.valueOf(CommonEnum.COMMON_ENUM_Y.type + ""));
order.setStatus(CommonEnum.COMMON_ENUM_Y.type);
order.setOrderTime(params.getUpdate_time());
- order.setMemo(params.getResason());
+ order.setMemo(params.getReason());
order.setShipName(params.getReason_name());
order.setCreateTime(new Date());
order.setUpdateTime(new Date());
--
Gitblit v1.9.1