From b86d9bf75e00ed5255273aaa129a6beb31e43aa6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 03 五月 2021 13:17:51 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
old mode 100644
new mode 100755
index 0219726..2413a49
--- a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -7,10 +7,12 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.RoomDto;
+import com.java110.dto.contract.ContractDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
@@ -191,22 +193,7 @@
paramInJson.put("feeInfo", feeDto);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
- feeReceiptDetailPo.setAmount(businessFeeDetail.getString("receivedAmount"));
- feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
- feeReceiptDetailPo.setCycle(businessFeeDetail.getString("cycles"));
- feeReceiptDetailPo.setDetailId(businessFeeDetail.getString("detailId"));
- feeReceiptDetailPo.setEndTime(businessFeeDetail.getString("endTime"));
- feeReceiptDetailPo.setFeeId(feeDto.getFeeId());
- feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
- feeReceiptDetailPo.setStartTime(businessFeeDetail.getString("startTime"));
- feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
- computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
- feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
- feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
- feeReceiptPo.setReceiptId(feeReceiptDetailPo.getReceiptId());
- feeReceiptPo.setObjType(feeDto.getPayerObjType());
- feeReceiptPo.setObjId(feeDto.getPayerObjId());
- feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
+
return business;
}
@@ -269,6 +256,9 @@
feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
+ //鏌ヨ涓氫富淇℃伅
+ OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDto);
+
feeReceiptDetailPos.add(feeReceiptDetailPo);
feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
@@ -276,6 +266,8 @@
feeReceiptPo.setObjType(feeDto.getPayerObjType());
feeReceiptPo.setObjId(feeDto.getPayerObjId());
feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
+ feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
+ feeReceiptPo.setPayObjName(ownerDto.getName());
feeReceiptPos.add(feeReceiptPo);
return business;
}
@@ -691,6 +683,43 @@
}
/**
+ * 娣诲姞鐗╀笟璐圭敤
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public JSONObject addContractFee(ContractDto contractDto, JSONObject paramInJson, DataFlowContext 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");
+ businessUnit.put("startTime", time);
+ businessUnit.put("endTime", time);
+ businessUnit.put("communityId", paramInJson.getString("communityId"));
+ businessUnit.put("payerObjId", contractDto.getContractId());
+ businessUnit.put("payerObjType", FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+ 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(PayFeePo.class.getSimpleName(), businessUnit);
+ paramInJson.put("feeId", businessUnit.getString("feeId"));
+ return business;
+ }
+
+ /**
* 娣诲姞璐圭敤椤逛俊鎭�
*
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
--
Gitblit v1.8.0