From cdc97336e2f2a7109a0b0b66b2e33bc85b748d08 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 31 五月 2020 09:57:06 +0800
Subject: [PATCH] 处理费用和侦听 监听内容不一致问题
---
Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
index a828a78..0fb1569 100644
--- a/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -15,9 +15,13 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.PayFeeConfigPo;
+import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
-import com.java110.utils.constant.*;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -90,7 +94,7 @@
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", paramInJson);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), paramInJson);
return business;
}
@@ -188,7 +192,7 @@
businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
}
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFeeDetail);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
return business;
}
@@ -228,7 +232,7 @@
feeMap.put("configEndTime", feeInfo.getConfigEndTime());
businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO, businessFee);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
}
@@ -319,7 +323,7 @@
double tmpReceivableAmount = cycles.multiply(receivableAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFeeDetail);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("receivableAmount", tmpReceivableAmount);
return business;
}
@@ -350,7 +354,7 @@
feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO, businessFee);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
}
@@ -374,7 +378,7 @@
businessCarInout.putAll(BeanConvertUtil.beanCovertMap(carInoutDto));
businessCarInout.put("state", "100400");
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT, businessCarInout);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CarInoutPo.class.getSimpleName(), businessCarInout);
return business;
}
@@ -444,7 +448,7 @@
double receivableAmount = money;
businessFeeDetail.put("receivableAmount", receivableAmount);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFeeDetail);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("receivableAmount", receivableAmount);
return business;
}
@@ -472,7 +476,7 @@
feeMap.put("amount", paramInJson.getString("receivableAmount"));
feeMap.put("state", "2009001");
businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFee);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
}
@@ -521,7 +525,7 @@
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO, businessUnit);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
return business;
}
@@ -554,7 +558,7 @@
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO, businessUnit);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
return business;
}
--
Gitblit v1.8.0