From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java | 153 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 111 insertions(+), 42 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java
old mode 100644
new mode 100755
index 8e0fb38..34fbca9
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java
@@ -4,39 +4,41 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDto;
+import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.fee.*;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.repair.RepairDto;
import com.java110.fee.bmo.IPayOweFee;
import com.java110.fee.listener.fee.UpdateFeeInfoListener;
+import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRepairInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.*;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
+import com.java110.po.feeReceipt.FeeReceiptPo;
+import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import com.java110.po.owner.RepairPoolPo;
-import com.java110.utils.constant.FeeFlagTypeConstant;
-import com.java110.utils.constant.FeeStateConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
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.Service;
import java.math.BigDecimal;
import java.text.ParseException;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 娆犺垂缂磋垂瀹炵幇绫�
@@ -62,6 +64,24 @@
@Autowired
private IRepairInnerServiceSMO repairInnerServiceSMOImpl;
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ @Autowired
+ private IComputeFeeSMO computeFeeSMOImpl;
+
/**
* 娆犺垂缂磋垂
*
@@ -78,28 +98,40 @@
JSONArray fees = reqJson.getJSONArray("fees");
JSONObject feeObj = null;
+ FeeReceiptPo feeReceiptPo = new FeeReceiptPo();
+ feeReceiptPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
+ feeReceiptPo.setAmount("0.0");
+
+ feeReceiptPo.setPayObjId("-1");
+ feeReceiptPo.setPayObjName("鏈煡");
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
feeObj = fees.getJSONObject(feeIndex);
Assert.hasKeyAndValue(feeObj, "feeId", "鏈寘鍚垂鐢ㄩ」ID");
- Assert.hasKeyAndValue(feeObj, "feeId", "鏈寘鍚垂鐢ㄩ」ID");
+ Assert.hasKeyAndValue(feeObj, "feePrice", "鏈寘鍚即璐归噾棰�");
feeObj.put("communityId", communityId);
- doPayOweFee(feeObj);
+ doPayOweFee(feeObj, feeReceiptPo);
}
- return ResultVo.success();
+ if (fees.size() > 0) {
+ feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
+ }
+ return ResultVo.createResponseEntity(feeReceiptPo);
}
- private void doPayOweFee(JSONObject feeObj) {
+ private void doPayOweFee(JSONObject feeObj, FeeReceiptPo feeReceiptPo) {
//寮�鍚叏灞�閿�
String requestId = DistributedLock.getLockUUID();
String key = this.getClass().getSimpleName() + feeObj.get("feeId");
try {
DistributedLock.waitGetDistributedLock(key, requestId);
- addFeeDetail(feeObj);
+ addFeeDetail(feeObj, feeReceiptPo);
modifyFee(feeObj);
+
+ //灏嗘湁璐﹀崟涓嬬殑 鐘舵�佹敼涓哄凡缁忕即璐�
+ modifyFeeBill(feeObj);
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -129,38 +161,49 @@
/**
* @param feeObj
*/
+ private void modifyFeeBill(JSONObject feeObj) {
+
+ if (FeeConfigDto.BILL_TYPE_EVERY.equals(feeObj.getString("billType"))) {
+ return;
+ }
+ BillDto billDto = new BillDto();
+ billDto.setCommunityId(feeObj.getString("communityId"));
+ billDto.setConfigId(feeObj.getString("configId"));
+ billDto.setCurBill("T");
+ List<BillDto> billDtos = feeInnerServiceSMOImpl.queryBills(billDto);
+ if (billDtos == null || billDtos.size() < 1) {
+ return;
+ }
+ BillOweFeeDto billOweFeeDto = new BillOweFeeDto();
+ billOweFeeDto.setCommunityId(feeObj.getString("communityId"));
+ billOweFeeDto.setFeeId(feeObj.getString("feeId"));
+ billOweFeeDto.setState(BillOweFeeDto.STATE_FINISH_FEE);
+ billOweFeeDto.setBillId(billDtos.get(0).getBillId());
+ feeInnerServiceSMOImpl.updateBillOweFees(billOweFeeDto);
+
+ }
+
+ /**
+ * @param feeObj
+ */
private void modifyFee(JSONObject feeObj) throws ParseException {
PayFeePo payFeePo = new PayFeePo();
FeeDto feeInfo = (FeeDto) feeObj.get("feeInfo");
- Date endTime = feeInfo.getEndTime();
- Calendar endCalender = Calendar.getInstance();
- endCalender.setTime(endTime);
- int hours = 0;
- hours = new Double(Double.parseDouble(feeObj.getString("tmpCycles")) * DateUtil.getCurrentMonthDay() * 24).intValue();
- endCalender.add(Calendar.HOUR, hours);
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setConfigId(feeInfo.getConfigId());
feeConfigDto.setCommunityId(feeInfo.getCommunityId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
-
Assert.listOnlyOne(feeConfigDtos, "鏈壘鍒拌垂鐢ㄩ厤缃�");
- payFeePo.setEndTime(DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
- // 涓�娆℃�ф敹璐圭被鍨嬶紝缂磋垂鍚庯紝鍒欒缃垂鐢ㄧ姸鎬佷负鏀惰垂缁撴潫銆佽缃粨鏉熸棩鏈熶负璐圭敤椤圭粓姝㈡棩鏈�
- if (FeeFlagTypeConstant.ONETIME.equals(feeConfigDtos.get(0).getFeeFlag())) {
- payFeePo.setState(FeeStateConstant.END);
- payFeePo.setEndTime(feeConfigDtos.get(0).getEndTime());
- }
- // 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
- if (FeeFlagTypeConstant.CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
- if ((feeInfo.getEndTime()).after(DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A))) {
- payFeePo.setState(FeeStateConstant.END);
- payFeePo.setEndTime(feeConfigDtos.get(0).getEndTime());
- }
- }
+ feeObj.put("billType", feeConfigDtos.get(0).getBillType());
+ feeObj.put("configId", feeConfigDtos.get(0).getConfigId());
+ Date targetEndTime = computeFeeSMOImpl.getFeeEndTimeByCycles(feeInfo, feeObj.getString("tmpCycles"));
+ String state = computeFeeSMOImpl.getFeeStateByCycles(feeInfo, feeObj.getString("tmpCycles"));
payFeePo.setFeeId(feeObj.getString("feeId"));
- payFeePo.setEndTime(DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ payFeePo.setEndTime(DateUtil.getFormatTimeString(targetEndTime, DateUtil.DATE_FORMATE_STRING_A));
+ payFeePo.setState(state);
payFeePo.setCommunityId(feeObj.getString("communityId"));
+ payFeePo.setStatusCd("0");
int saveFlag = feeInnerServiceSMOImpl.updateFee(payFeePo);
if (saveFlag < 1) {
throw new IllegalArgumentException("缂磋垂澶辫触" + payFeePo.toString());
@@ -172,7 +215,7 @@
*
* @param paramInJson
*/
- private void addFeeDetail(JSONObject paramInJson) {
+ private void addFeeDetail(JSONObject paramInJson, FeeReceiptPo feeReceiptPo) {
PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
@@ -182,28 +225,54 @@
feeDto.setFeeId(paramInJson.getString("feeId"));
feeDto.setCommunityId(paramInJson.getString("communityId"));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
-
feeDto = feeDtos.get(0);
paramInJson.put("feeInfo", feeDto);
-
- BigDecimal feePrice = new BigDecimal("0.00");
+ payFeeDetailPo.setStartTime(DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ Map feePriceAll=computeFeeSMOImpl.getFeePrice(feeDto);
+ BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("feePrice")));
BigDecimal cycles = receivedAmount.divide(feePrice, 2, BigDecimal.ROUND_HALF_EVEN);
paramInJson.put("tmpCycles", cycles);
+ payFeeDetailPo.setEndTime(DateUtil.getFormatTimeString(computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, cycles.doubleValue() + ""), DateUtil.DATE_FORMATE_STRING_A));
payFeeDetailPo.setCommunityId(paramInJson.getString("communityId"));
payFeeDetailPo.setCycles(cycles.doubleValue() + "");
payFeeDetailPo.setReceivableAmount(receivedAmount.doubleValue() + "");
payFeeDetailPo.setReceivedAmount(receivedAmount.doubleValue() + "");
+ payFeeDetailPo.setFeeId(feeDto.getFeeId());
int saveFeeDetail = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
if (saveFeeDetail < 1) {
throw new IllegalArgumentException("淇濆瓨璐圭敤璇︽儏澶辫触" + payFeeDetailPo.toString());
}
+ FeeReceiptDetailPo feeReceiptDetailPo = new FeeReceiptDetailPo();
+ feeReceiptDetailPo.setAmount(payFeeDetailPo.getReceivableAmount());
+ feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
+ feeReceiptDetailPo.setCycle(payFeeDetailPo.getCycles());
+ feeReceiptDetailPo.setDetailId(payFeeDetailPo.getDetailId());
+ feeReceiptDetailPo.setEndTime(payFeeDetailPo.getEndTime());
+ feeReceiptDetailPo.setFeeId(feeDto.getFeeId());
+ feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
+ feeReceiptDetailPo.setStartTime(payFeeDetailPo.getStartTime());
+ feeReceiptDetailPo.setReceiptId(feeReceiptPo.getReceiptId());
+ computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
+ feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
+
+ BigDecimal amount = new BigDecimal(Double.parseDouble(feeReceiptPo.getAmount()));
+ amount = amount.add(receivedAmount);
+ feeReceiptPo.setAmount(amount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + "");
+ feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
+ feeReceiptPo.setObjType(feeDto.getPayerObjType());
+ feeReceiptPo.setObjId(feeDto.getPayerObjId());
+ if (StringUtil.isEmpty(feeReceiptPo.getObjName())) {
+ feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
+ }
+ OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDto);
+ feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
+ feeReceiptPo.setPayObjName(ownerDto.getName());
}
}
--
Gitblit v1.8.0