From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java
index 9957fdf..7cd6de0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java
@@ -163,7 +163,7 @@
         String orderNumber = po.getOrderNumber();
         Long virtualId = po.getVirtualId();
         Long clientId = po.getClientId();
-        Integer rechargeAmount = po.getRechargeAmount();
+        Double rechargeAmount = po.getRechargeAmount();
 
         // 楠岃瘉璇ヨ櫄鎷熷崱璐︽埛鏄惁瀛樺湪骞跺彇鍑哄綋鍓嶈处鎴蜂綑棰�
         SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId);
@@ -216,7 +216,7 @@
 
         Long virtualId = seVcRecharge.getVcId();
         Double money = seVcRecharge.getMoney();
-        Integer rechargeAmount = seVcRecharge.getRechargeAmount();
+        Double rechargeAmount = seVcRecharge.getRechargeAmount();
         Double afterRrecharge = money + rechargeAmount;
 
         seVcRecharge.setAfterRecharge(afterRrecharge);
@@ -339,7 +339,7 @@
      * @param orderNumber
      * @return
      */
-    public Integer getRechargeAmountByOrderNumber(String orderNumber) {
+    public Double getRechargeAmountByOrderNumber(String orderNumber) {
         return seVcRechargeMapper.getRechargeAmountByOrderNumber(orderNumber);
 
     }

--
Gitblit v1.8.0