From 8954b6c80d6f496baaa9d5a2c3fe5fbbf020bf67 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 31 五月 2020 12:27:42 +0800
Subject: [PATCH] 优化重置密码bug
---
Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 96 +++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 53 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 89cd02a..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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.IApiBaseBMO;
import com.java110.api.bmo.fee.IFeeBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -16,7 +15,10 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.entity.order.Orders;
+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.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
@@ -59,6 +61,7 @@
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -66,19 +69,11 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFeeConfig = new JSONObject();
- businessFeeConfig.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ public void deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
+ super.delete(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_CONFIG);
}
+
/**
* 娣诲姞鐗╀笟璐圭敤
*
@@ -86,17 +81,20 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ public void deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
JSONObject businessUnit = new JSONObject();
businessUnit.put("feeId", paramInJson.getString("feeId"));
businessUnit.put("communityId", paramInJson.getString("communityId"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
+ PayFeePo payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
+ super.delete(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
+ }
+ public JSONObject updateFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ 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(PayFeePo.class.getSimpleName(), paramInJson);
return business;
}
@@ -184,7 +182,7 @@
//BigDecimal receivableAmount = feePrice;
if ("-101".equals(paramInJson.getString("cycles"))) {//鑷畾涔夌即璐�
BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
- cycles = receivedAmount.divide(feePrice,2,BigDecimal.ROUND_HALF_EVEN);
+ cycles = receivedAmount.divide(feePrice, 2, BigDecimal.ROUND_HALF_EVEN);
paramInJson.put("tmpCycles", cycles);
businessFeeDetail.put("cycles", cycles.doubleValue());
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
@@ -194,7 +192,7 @@
businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
}
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessFeeDetail);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
return business;
}
@@ -231,8 +229,10 @@
feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
feeMap.put("cycles", paramInJson.getString("cycles"));
+ feeMap.put("configEndTime", feeInfo.getConfigEndTime());
+
businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
}
@@ -323,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("businessFeeDetail", businessFeeDetail);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("receivableAmount", tmpReceivableAmount);
return business;
}
@@ -354,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("businessFee", businessFee);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
}
@@ -372,13 +372,13 @@
CarInoutDto carInoutDto = carInoutDtos.get(0);
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ+2);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessCarInout = new JSONObject();
businessCarInout.putAll(BeanConvertUtil.beanCovertMap(carInoutDto));
businessCarInout.put("state", "100400");
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCarInout", businessCarInout);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CarInoutPo.class.getSimpleName(), businessCarInout);
return business;
}
@@ -448,7 +448,7 @@
double receivableAmount = money;
businessFeeDetail.put("receivableAmount", receivableAmount);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessFeeDetail);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("receivableAmount", receivableAmount);
return business;
}
@@ -476,7 +476,7 @@
feeMap.put("amount", paramInJson.getString("receivableAmount"));
feeMap.put("state", "2009001");
businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
}
@@ -488,20 +488,13 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFeeConfig = new JSONObject();
- businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("configId", "-1");
- businessFeeConfig.put("isDefault", "F");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ paramInJson.put("configId", "-1");
+ paramInJson.put("isDefault", "F");
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -532,10 +525,11 @@
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("businessFee", businessUnit);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
return business;
}
+
/**
* 娣诲姞鐗╀笟璐圭敤
*
@@ -564,10 +558,11 @@
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("businessFee", businessUnit);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
return business;
}
+
/**
* 娣诲姞璐圭敤椤逛俊鎭�
*
@@ -575,24 +570,19 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
feeConfigDto.setConfigId(paramInJson.getString("configId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "鏈壘鍒拌璐圭敤椤�");
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("isDefault", feeConfigDtos.get(0).getIsDefault());
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+ super.update(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_CONFIG);
}
}
--
Gitblit v1.8.0