From 51aa6b4f8a3d199b3e5f93f7b5513a040aecfc10 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 四月 2022 15:00:22 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java b/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
index 5b3b6e1..b48ad19 100755
--- a/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
@@ -50,7 +50,7 @@
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -142,7 +142,10 @@
businessPayFeeDetails = (JSONArray) bObj;
}
} else {
- return;
+ if (data instanceof JSONObject) {
+ businessPayFeeDetails = new JSONArray();
+ businessPayFeeDetails.add(data);
+ }
}
for (int bPayFeeDetailIndex = 0; bPayFeeDetailIndex < businessPayFeeDetails.size(); bPayFeeDetailIndex++) {
JSONObject businessPayFeeDetail = businessPayFeeDetails.getJSONObject(bPayFeeDetailIndex);
@@ -192,6 +195,8 @@
String feeTypeCd = feeDtos.get(0).getFeeTypeCd();
//鑾峰彇浠樿垂瀵硅薄绫诲瀷
String payerObjType = feeDtos.get(0).getPayerObjType();
+ //鑾峰彇鐘舵��
+ String state = payFeeDetailPo.getState();
//杞︾墝鍙�
String carNum = "";
//鍋滆溅鍦�
@@ -220,15 +225,17 @@
paramIn.put("carNum", carNum);
paramIn.put("num", num);
paramIn.put("spaceNum", spaceNum);
+ paramIn.put("state", state);
//缁欎笟涓绘帹閫佹秷鎭�
sendMessage(paramIn, communityDtos.get(0), payFeeDetailPo);
- if (feeTypeCd.equals("888800010012")) {
+ if (!StringUtil.isEmpty(state) && !state.equals("1300") && feeTypeCd.equals("888800010012")) {
//缁欏鐞嗘姤淇畬缁撳崟鐨勭淮淇笀鍌呮帹閫佹秷鎭�
sendMsg(paramIn, communityDtos.get(0), payFeeDetailPo);
}
- //缁欏憳宸ユ帹閫佹秷鎭�
- publishMsg(paramIn, communityDtos.get(0), payFeeDetailPo);
-
+ if (!StringUtil.isEmpty(state) && !state.equals("1300")) {
+ //缁欏憳宸ユ帹閫佹秷鎭�
+ publishMsg(paramIn, communityDtos.get(0), payFeeDetailPo);
+ }
}
/**
@@ -480,7 +487,11 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.setFirst(new Content("鏈缂磋垂宸插埌璐�"));
+ if (!StringUtil.isEmpty(paramIn.getString("state")) && paramIn.getString("state").equals("1300")) {
+ data.setFirst(new Content("鏈閫�璐瑰凡鍒拌处"));
+ } else {
+ data.setFirst(new Content("鏈缂磋垂宸插埌璐�"));
+ }
if (payerObjType.equals("3333")) { //鎴垮眿
data.setKeyword1(new Content(paramIn.getString("payFeeRoom")));
data.setKeyword2(new Content(paramIn.getString("feeTypeCdName")));
@@ -489,7 +500,14 @@
data.setKeyword2(new Content(paramIn.getString("feeTypeCdName") + "-" + paramIn.getString("carNum")));
}
data.setKeyword3(new Content(paramIn.getString("payFeeTime")));
- data.setKeyword4(new Content(paramIn.getString("receivedAmount") + "鍏�"));
+ if (!StringUtil.isEmpty(paramIn.getString("state")) && paramIn.getString("state").equals("1300")) {
+ //鑾峰彇閫�璐归噾棰�
+ double receivedAmount = Double.parseDouble(paramIn.getString("receivedAmount"));
+ double money = receivedAmount * (-1.00);
+ data.setKeyword4(new Content("閫�璐�" + money + "鍏�"));
+ } else {
+ data.setKeyword4(new Content(paramIn.getString("receivedAmount") + "鍏�"));
+ }
data.setRemark(new Content("鎰熻阿鎮ㄧ殑浣跨敤,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
templateMessage.setData(data);
//鑾峰彇涓氫富鍏紬鍙峰湴鍧�
--
Gitblit v1.8.0