From 03df72155ccd47912384b3e5f3fceb7331e377de Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 13 九月 2024 14:48:49 +0800
Subject: [PATCH] 2024-09-13 朱宝民 优化获取交易明细记录，余额改为操作表余额，返回字段增加收银员姓名及分页参数
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
index 64acd6b..74589e5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -51,7 +51,6 @@
@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗")
@RestController
@RequestMapping(path = "valve")
-//@RequiredArgsConstructor
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
@@ -134,6 +133,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -143,10 +145,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if (protocol.equals("p206V202404")) {
@@ -246,6 +254,9 @@
Long intakeId = job_rtu.getLong("intakeId");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
@@ -351,6 +362,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -360,10 +374,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -444,6 +464,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -453,10 +476,17 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
+
String commandCode = null;
if(protocol.equals("p206V202404")) {
return BaseResponseUtils.buildSuccess();
@@ -543,6 +573,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -552,10 +585,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -648,6 +687,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -657,10 +699,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
--
Gitblit v1.8.0