From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 206 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 137 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 313ebc8..6505238 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -5,12 +5,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.ErpSecret;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.impl.ErpSecretServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.utils.HttpHandler;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +22,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
@@ -32,9 +37,9 @@
//绔彛
private String URL;
- @Value("${erp.address.outaddressAudit}")
+ @Value("${erp.address.imPurinbillBatchAudit}")
//瀹℃牳鍦板潃
- private String outaddressAudit;
+ private String imPurinbillBatchAudit;
@Autowired
private OrderService orderService;
@@ -43,91 +48,154 @@
@Autowired
private DocTypeService docTypeService;
@Autowired
+ private ErpSecretServiceImpl erpSecretService;
+ @Autowired
private LoginAuthenticationHandler loginAuthenticationHandler;
-
+ @Value("${erp.login.accountId}")
+ private String accountId;
+ @Value("${erp.login.xAcfwIdentity}")
+ private String xAcfwIdentity;
+ private String path;
@Transactional
public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+
+ // 鑾峰彇 Token
+ ErpSecret erpSecret = erpSecretService.selectOne(new EntityWrapper<ErpSecret>().eq("account_id", accountId));
+
+ // 鑾峰彇 DocType
DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
+ if (docType == null) return SUCCESS;
+
+ // 鑾峰彇 KingDee 绫诲瀷
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.formId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
+ // 鏋勫缓璇锋眰鍙傛暟
+ JSONObject add = buildRequestParams(order, kingDeeUtilType, sdf1, sdf2);
+ if (add == null) return FAIL.setMsg("璇锋眰鍙傛暟鏋勫缓澶辫触");
+
+ // 鍙戦�佽姹傚苟澶勭悊鍝嶅簲
+ return sendRequestAndProcessResponse(order, erpSecret, add);
+ }
+
+ private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType,
+ SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
+ switch (kingDeeUtilType.formId) {
+ case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗曟彁浜�
+ path = imPurinbillBatchAudit;
+ JSONArray idArray = new JSONArray();
+ idArray.add(order.getNumber());
+ JSONObject dataObj = new JSONObject();
+ dataObj.fluentPut("id", idArray);
+ return new JSONObject().fluentPut("data", dataObj);
+
+ default:
+ throw new IllegalArgumentException("Unsupported formId: " + kingDeeUtilType.formId);
+ }
+ }
+
+ private ReturnT<String> sendRequestAndProcessResponse(Order order, ErpSecret erpSecret, JSONObject add) {
String response = "";
boolean success = false;
+
try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
+ // 璁剧疆璇锋眰澶�
+ HashMap<String, Object> headers = buildRequestHeaders(erpSecret);
+
+ // 鍙戦�佽姹傦紝灏� JSONObject 杞崲涓� String
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(outaddressAudit)
- .setJson(add)
+ .setPath(path)
+ .setJson(add.toJSONString()) // 灏� JSONObject 杞崲涓� String
.build()
.doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
- //瀹℃牳瀹屾垚鍘熻鍗�4杞�8 8.瀹℃牳瀹屾垚
- if(bool.equals("true")){
- success = true;
- order.setSettle(8L);
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+
+ // 瑙ｆ瀽鍝嶅簲
+ JSONObject jsonResponse = JSON.parseObject(response);
+
+ // 鍒ゆ柇鏄惁鍥犱负 token 杩囨湡 (errorCode = 401)
+ if ("401".equals(jsonResponse.getString("errorCode"))) {
+ log.error("璁よ瘉澶辫触锛屽皾璇曢噸鏂拌幏鍙� Token");
+ loginAuthenticationHandler.start(); // 鍒锋柊 token
+ // 閲嶆柊鑾峰彇鏂扮殑 token
+ erpSecret = erpSecretService.selectOne(new EntityWrapper<ErpSecret>().eq("account_id", accountId)); // 閲嶆柊浠庢暟鎹簱鑾峰彇鏂扮殑 token
+ // 浣跨敤鏂扮殑 token 閲嶈瘯璇锋眰
+ headers.put("accesstoken", erpSecret.getAccessToken());
+ response = new HttpHandler.Builder()
+ .setHeaders(headers)
+ .setUri(URL)
+ .setPath(path)
+ .setJson(add.toJSONString()) // 灏� JSONObject 杞崲涓� String
+ .build()
+ .doPost();
}
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "瀹℃牳",
- URL+ outaddressAudit,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
- return result;
+ // 瑙ｆ瀽杩斿洖鐨勫搷搴�
+ JSONObject data = jsonResponse.getJSONObject("data");
+ String errorCode = jsonResponse.getString("errorCode");
+ boolean status = jsonResponse.getBooleanValue("status");
+ if ("0".equals(errorCode) && status) {
+ // 鑾峰彇鎴愬姛涓庡け璐ョ殑鏁伴噺
+ int successCount = data.getInteger("successCount");
+ int failCount = data.getInteger("failCount");
+
+ if (failCount == 0) {
+ success = true;
+ log.info("鎺ュ彛璋冪敤鎴愬姛锛屾垚鍔熺殑鎿嶄綔鏁伴噺: {}", successCount);
+ } else {
+ log.error("鎺ュ彛璋冪敤澶辫触锛屽け璐ョ殑鎿嶄綔鏁伴噺: {}", failCount);
+ // 濡傛灉鏈夊け璐ョ殑鍗曟嵁锛岄亶鍘� result 鏁扮粍鏌ョ湅澶辫触鐨勮缁嗕俊鎭�
+ JSONArray resultArray = data.getJSONArray("result");
+ for (int i = 0; i < resultArray.size(); i++) {
+ JSONObject resultItem = resultArray.getJSONObject(i);
+ if (!resultItem.getBoolean("billStatus")) {
+ // 鍗曟嵁澶勭悊澶辫触锛岃褰曢敊璇俊鎭�
+ String billNo = resultItem.getString("number"); // 鑾峰彇杩斿洖鐨勫崟鎹彿
+ JSONArray errors = resultItem.getJSONArray("errors"); // 鑾峰彇閿欒淇℃伅
+
+ // 鎵撳嵃鍗曟嵁鍙峰拰閿欒淇℃伅
+ log.error("鍗曟嵁鍙�: {}, 閿欒淇℃伅: {}", billNo, errors);
+ }
}
}
- } else if (v instanceof JSONObject){
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
- return result;
- }
+
+ order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
+ orderService.updateById(order);
+ } else {
+ log.error("鎺ュ彛璋冪敤澶辫触锛岄敊璇俊鎭�: {}", jsonResponse.getString("message"));
}
+ } catch (Exception e) {
+ log.error("璇锋眰澶辫触", e);
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ saveApiLog(add, response, success);
}
- return null;
+
+ return success ? SUCCESS : FAIL;
+ }
+
+ private HashMap<String, Object> buildRequestHeaders(ErpSecret erpSecret) {
+ HashMap<String, Object> headers = new HashMap<>();
+ headers.put("accesstoken", erpSecret.getAccessToken());
+ headers.put("x-acgw-identity", xAcfwIdentity); // 鑷畾涔夎姹傚ご
+ return headers;
+ }
+
+ private void saveApiLog(JSONObject add, String response, boolean success) {
+ try {
+ apiLogService.save(
+ "鍗曟嵁涓婃姤瀹℃牳",
+ URL + imPurinbillBatchAudit,
+ null,
+ "127.0.0.1",
+ add.toJSONString(),
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("鎺ュ彛鏃ュ織淇濆瓨澶辫触", e);
+ }
}
}
--
Gitblit v1.9.1