From 2e930e8e96bca4159538ba84fae1c62880134e5c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 15:47:58 +0800
Subject: [PATCH] 2024-07-02 朱宝民 获取充值记录
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index c4931dc..6275ab9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -256,6 +256,7 @@
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
+ comId = rmCommandHistory.getId();
// 鍥炶皟寮傚父
if(!response_CallBack.getCode().equals("0001")) {
@@ -289,12 +290,24 @@
System.out.println(job_subData);
Boolean dealResult = job_subData.getBoolean("success");
if(!dealResult) {
+ /**
+ * 鎵ц澶辫触
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ */
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)0);
+ rmCommandHistory.setResultTime(new Date());
+ rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
}
/**
- * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹�
+ * 鎵ц鎴愬姛
* 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ * 杩斿洖鍥炶皟鍐呭
*/
if(comType != null) {
SeVirtualCard virtualCard = new SeVirtualCard();
@@ -311,6 +324,15 @@
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
+
+ // 鏇存柊鍛戒护鏃ュ織锛氭墽琛岀粨鏋溿�佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)1);
+ rmCommandHistory.setResultTime(new Date());
+ rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+
return BaseResponseUtils.buildSuccess(myData) ;
} else {
// 璇锋眰澶辫触
--
Gitblit v1.8.0