From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:33:53 +0800
Subject: [PATCH] 有关表阀一体机(王江海制定)通信协议: 1、根据新版本协议,解析部分更新; 2、根据测试一体阀协议数据处理需求与逻辑,进行表阀一体机数据处理。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/VirtualCardSv.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/VirtualCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/VirtualCardSv.java
index 54b2a4d..0d259f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/VirtualCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/VirtualCardSv.java
@@ -8,7 +8,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeVcRefund;
import com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem;
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
-import com.dy.pipIrrGlobal.voPr.VoController;
import com.dy.pipIrrGlobal.voSe.VoOrders;
import com.dy.pipIrrGlobal.voSe.VoVcRecharge;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
@@ -20,6 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -52,6 +52,9 @@
@Autowired
private SeClientMapper seClientMapper;
+ @Value("${vc.alarmValue}")
+ private Integer alarmValue;
+
/**
* 鏍规嵁鍐滄埛ID鑾峰彇5绾ц鏀垮尯鍒掍唬鐮侊紝娉ㄥ唽铏氭嫙鍗′娇鐢�
* @param clientId 鍐滄埛ID
@@ -66,7 +69,7 @@
* @return
*/
public List<VoVirtualCard> getVCs(Long clientId) {
- return seVirtualCardMapper.getVCs(clientId);
+ return seVirtualCardMapper.getVCs(alarmValue, clientId);
}
/**
@@ -135,7 +138,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);
@@ -186,7 +189,7 @@
Long virtualId = seVcRecharge.getVcId();
Double money = seVcRecharge.getMoney();
- Integer rechargeAmount = seVcRecharge.getRechargeAmount();
+ Double rechargeAmount = seVcRecharge.getRechargeAmount();
Double afterRrecharge = money + rechargeAmount;
seVcRecharge.setAfterRecharge(afterRrecharge);
@@ -309,7 +312,7 @@
* @param orderNumber
* @return
*/
- public Integer getRechargeAmountByOrderNumber(String orderNumber) {
+ public Double getRechargeAmountByOrderNumber(String orderNumber) {
return seVcRechargeMapper.getRechargeAmountByOrderNumber(orderNumber);
}
--
Gitblit v1.8.0