From f2e8f0ae62eea8a81f035b67bc6c965a959b8e73 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 14 六月 2024 10:49:59 +0800
Subject: [PATCH] 修改 充值接口 返回充值ID作为订单号
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index 7e7def7..3d9cbf5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -177,12 +177,13 @@
* 鎵ц鎴愬姛
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
*/
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
- //virtualCard.setInUse((byte) 1);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- //virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+// SeVirtualCard virtualCard = new SeVirtualCard();
+// virtualCard.setId(vcId);
+// virtualCard.setInUse((byte) 1);
+// virtualCard.setIntakeId(intakeId);
+// virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+// virtualCard.setLastOperateTime(new Date());
+// seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
// 鍥炶皟杩斿洖鐨勫唴瀹�
//Data myData = (Data)response_CallBack.getContent();
@@ -254,6 +255,7 @@
//SeVirtualCard virtualCard = new SeVirtualCard();
//virtualCard.setId(vcId);
//virtualCard.setInUse((byte) 1);
+ //virtualCard.setIntakeId(intakeId);
//virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
//virtualCard.setLastOperateTime(new Date());
//seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
@@ -285,6 +287,7 @@
SeVirtualCard virtualCard = new SeVirtualCard();
virtualCard.setId(vcId);
virtualCard.setInUse((byte) 1);
+ virtualCard.setIntakeId(intakeId);
virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
virtualCard.setLastOperateTime(new Date());
seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
@@ -398,13 +401,12 @@
* 鎵ц鎴愬姛
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
*/
- //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
+ //SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
//virtualCard.setInUse((byte) 0);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ //virtualCard.setIntakeId(null);
+ //virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
//virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ //seVirtualCardMapper.updateByPrimaryKey(virtualCard);
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
@@ -463,13 +465,13 @@
rmCommandHistory.setResult((byte)0);
commandSv.updateCommandResult(rmCommandHistory);
- //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
+
+ //SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
//virtualCard.setInUse((byte) 0);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ //virtualCard.setIntakeId(null);
+ //virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
//virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ //seVirtualCardMapper.updateByPrimaryKey(virtualCard);
return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
@@ -487,13 +489,12 @@
* 鎵ц鎴愬姛
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
*/
- Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
+ SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
virtualCard.setInUse((byte) 0);
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setIntakeId(null);
+ virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ seVirtualCardMapper.updateByPrimaryKey(virtualCard);
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
--
Gitblit v1.8.0