From 8f61316069a6ffffb0998ed3f498bd4e3acc77e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:36:15 +0800
Subject: [PATCH] 优化 费用
---
service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java | 112 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
index 68c4dd9..69121c3 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.DataFlowContext;
+import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.RoomDto;
-import com.java110.dto.attendanceClasses.AttendanceClassesDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
@@ -20,7 +20,7 @@
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IPayFeeDetailNewV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeConfigPo;
@@ -28,9 +28,7 @@
import com.java110.po.fee.PayFeePo;
import com.java110.po.feeReceipt.FeeReceiptPo;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -80,7 +78,7 @@
private IPayFeeDetailNewV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
@Autowired
- private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+ private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -363,7 +361,7 @@
/**
* 娣诲姞璐圭敤鏄庣粏淇℃伅
*
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @param
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
@@ -371,7 +369,7 @@
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
- businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ businessFeeDetail.put("detailId", paramInJson.getString("detailId"));
businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
if (!businessFeeDetail.containsKey("state")) {
businessFeeDetail.put("state", "1400");
@@ -411,12 +409,12 @@
}
businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
- businessFeeDetail.put("receivedAmount",paramInJson.getString("receivedAmount"));
+ businessFeeDetail.put("receivedAmount", paramInJson.getString("receivedAmount"));
- PayFeeDetailPo payFeeDetail = BeanConvertUtil.covertBean(businessFeeDetail,PayFeeDetailPo.class);
+ PayFeeDetailPo payFeeDetail = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
payFeeDetail.setbId("-1");
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetail);
- if(flag < 1){
+ if (flag < 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "淇濆瓨璐圭敤鏄庣粏澶辫触");
}
@@ -426,7 +424,7 @@
/**
* 淇敼璐圭敤淇℃伅
*
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @param
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
@@ -438,7 +436,22 @@
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) {
+ if (feeInfo.getDeadlineTime() != null) {
+ endCalender.setTime(feeInfo.getDeadlineTime());
+ } else if (!StringUtil.isEmpty(feeInfo.getCurDegrees())) {
+ endCalender.setTime(feeInfo.getCurReadingTime());
+ } else if (feeInfo.getImportFeeEndTime() == null) {
+ endCalender.setTime(feeInfo.getConfigEndTime());
+ } else {
+ endCalender.setTime(feeInfo.getImportFeeEndTime());
+ }
+ //businessFee.put("state",FeeDto.STATE_FINISH);
+ feeInfo.setState(FeeDto.STATE_FINISH);
+ }
feeInfo.setEndTime(endCalender.getTime());
+
+
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�" + JSONObject.toJSONString(feeInfo) + "|||" + paramInJson.getString("cycles"));
@@ -447,16 +460,30 @@
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(PayFeePo.class.getSimpleName(), businessFee);
- PayFeePo payFee = BeanConvertUtil.covertBean(businessFee,PayFeePo.class);
- int flag = payFeeNewV1InnerServiceSMOImpl.updatePayFeeNew(payFee);
- if(flag < 1){
+ // business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
+ PayFeePo payFee = BeanConvertUtil.covertBean(businessFee, PayFeePo.class);
+ int flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFee);
+ if (flag < 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "淇濆瓨璐圭敤鏄庣粏澶辫触");
}
//涓哄仠杞﹁垂鍗曠嫭澶勭悊
paramInJson.put("carFeeEndTime", feeInfo.getEndTime());
paramInJson.put("carPayerObjType", feeInfo.getPayerObjType());
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
+
+ // 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
+ if (FeeFlagTypeConstant.CYCLE.equals(feeInfo.getFeeFlag())) {
+ //杩欓噷 瀹归敊浜斿ぉ鏃堕棿
+ Date configEndTime = feeInfo.getConfigEndTime();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(configEndTime);
+ calendar.add(Calendar.DAY_OF_MONTH, -5);
+ configEndTime = calendar.getTime();
+ if (feeInfo.getEndTime().after(configEndTime)) {
+ businessFee.put("state", FeeStateConstant.END);
+ businessFee.put("endTime", feeInfo.getConfigEndTime());
+ }
+ }
return paramInJson;
}
@@ -592,19 +619,15 @@
/**
* 娣诲姞鐗╀笟璐圭敤
*
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param context 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFee(OwnerCarDto ownerCarDto, JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public JSONObject addFee(OwnerCarDto ownerCarDto, JSONObject paramInJson, ICmdDataFlowContext context) {
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
if (paramInJson.containsKey("startTime")) {
time = paramInJson.getString("startTime");
}
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.put("feeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
businessUnit.put("configId", paramInJson.getString("configId"));
@@ -619,27 +642,20 @@
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
businessUnit.put("batchId", paramInJson.getString("batchId"));
- businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
+ businessUnit.put("userId", context.getReqHeaders().get(CommonConstant.HTTP_USER_ID));
paramInJson.put("feeId", businessUnit.getString("feeId"));
- return business;
+ return businessUnit;
}
@Override
- public JSONObject addFeeAttr(JSONObject paramInJson, DataFlowContext dataFlowContext, String specCd, String value) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ public FeeAttrPo addFeeAttr(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext, String specCd, String value) {
FeeAttrPo feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(paramInJson.getString("communityId"));
feeAttrPo.setSpecCd(specCd);
feeAttrPo.setValue(value);
feeAttrPo.setFeeId(paramInJson.getString("feeId"));
- feeAttrPo.setAttrId("-1");
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(FeeAttrPo.class.getSimpleName(), JSONObject.parseObject(JSONObject.toJSONString(feeAttrPo)));
- return business;
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ return feeAttrPo;
}
@@ -669,7 +685,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, DataFlowContext dataFlowContext) throws ParseException {
+ public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, ICmdDataFlowContext dataFlowContext) {
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
if (paramInJson.containsKey("feeEndDate")) {
time = paramInJson.getString("feeEndDate");
@@ -683,10 +699,6 @@
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_SAVE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.put("feeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
businessUnit.put("configId", paramInJson.getString("configId"));
@@ -704,10 +716,10 @@
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
businessUnit.put("batchId", paramInJson.getString("batchId"));
- businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
+ businessUnit.put("userId", dataFlowContext.getReqHeaders().get(CommonConstant.HTTP_USER_ID));
+
paramInJson.put("feeId", businessUnit.getString("feeId"));
- return business;
+ return businessUnit;
}
/**
@@ -717,23 +729,22 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addContractFee(ContractDto contractDto, JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public JSONObject addContractFee(ContractDto contractDto, JSONObject paramInJson, ICmdDataFlowContext dataFlowContext) {
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
if (paramInJson.containsKey("feeEndDate")) {
time = paramInJson.getString("feeEndDate");
} else if (paramInJson.containsKey("startTime")) {
time = paramInJson.getString("startTime");
}
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.put("feeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
businessUnit.put("configId", paramInJson.getString("configId"));
businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
businessUnit.put("amount", "-1.00");
+ if (paramInJson.containsKey("amount") && !StringUtil.isEmpty(paramInJson.getString("amount"))) {
+ businessUnit.put("amount", paramInJson.getString("amount"));
+ }
businessUnit.put("startTime", time);
businessUnit.put("endTime", time);
businessUnit.put("communityId", paramInJson.getString("communityId"));
@@ -742,10 +753,9 @@
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
businessUnit.put("batchId", paramInJson.getString("batchId"));
- businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
+ businessUnit.put("userId", paramInJson.getString("userId"));
paramInJson.put("feeId", businessUnit.getString("feeId"));
- return business;
+ return businessUnit;
}
/**
--
Gitblit v1.8.0