From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 811 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 693 insertions(+), 118 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index c39c169..63e8730 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -5,41 +5,42 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.factory.Java110TransactionalFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.accountDetail.AccountDetailDto;
-import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
+import com.java110.dto.account.AccountDetailDto;
+import com.java110.dto.fee.*;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.community.IRepairInnerServiceSMO;
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.*;
import com.java110.intf.fee.*;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.po.accountDetail.AccountDetailPo;
-import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.account.AccountDetailPo;
+import com.java110.po.fee.FeeAttrPo;
+import com.java110.po.room.ApplyRoomDiscountPo;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
+import com.java110.po.fee.FeeAccountDetailPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
-import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
+import com.java110.po.payFee.PayFeeDetailDiscountPo;
+import com.java110.utils.cache.CommonCache;
+import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.FeeFlagTypeConstant;
-import com.java110.utils.constant.FeeStateConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.ListenerExecuteException;
@@ -53,20 +54,26 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+/**
+ * 鍓嶅彴 鐜伴噾鎴栬�呰浆璐︽敹璐� 缂磋垂澶勭悊绫�
+ * <p>
+ * 鍋囧 缂磋垂 鍚庤澶勭悊涓�浜涢�昏緫寤鸿鐢╠atabus
+ * 杩欎釜绫诲凡缁忓緢澶嶆潅 锛屾渶濂戒笉瑕佸姞鏂伴�昏緫
+ */
@Java110Cmd(serviceCode = "fee.payFee")
-public class PayFeeCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(PayFeeCmd.class);
+public class PayFeeCmd extends Cmd {
+ private static Logger logger = LoggerFactory.getLogger(PayFeeCmd.class);
@Autowired
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
+
@Autowired
- private IPayFeeDetailNewV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
@Autowired
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@@ -83,7 +90,6 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
@Autowired
private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
@@ -99,30 +105,38 @@
@Autowired
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
-
@Autowired
private IAccountDetailInnerServiceSMO accountDetailInnerServiceSMOImpl;
@Autowired
private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
-
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
@Autowired
private IPayFeeDetailDiscountNewV1InnerServiceSMO payFeeDetailDiscountNewV1InnerServiceSMOImpl;
+
@Autowired
- private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
+ private IRepairPoolV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
+
@Autowired
- private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
+ private IRepairUserV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
+
@Autowired
private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
+
@Autowired
private ICouponUserDetailV1InnerServiceSMO couponUserDetailV1InnerServiceSMOImpl;
@Autowired
private IOwnerCarNewV1InnerServiceSMO ownerCarNewV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
@@ -158,47 +172,99 @@
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
- if (feeConfigDtos != null && feeConfigDtos.size() == 1) {
- try {
- Date configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
+ if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
+ throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
+ }
+ /*//涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
+ Date maxEndTime = feeDtos.get(0).getDeadlineTime();
+ //鍛ㄦ湡鎬ц垂鐢�
+ if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
+ }*/
+ Date maxEndTime = null;
+ if (!StringUtil.isEmpty(feeDto.getFeeFlag()) && feeDto.getFeeFlag().equals(FeeDto.FEE_FLAG_CYCLE)) { //鍛ㄦ湡鎬ц垂鐢�
+ maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
+ } else { //涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
+ maxEndTime = feeDtos.get(0).getDeadlineTime();
+ }
- Date newDate = DateUtil.stepMonth(endTime, reqJson.getInteger("cycles") - 1);
-
- if (newDate.getTime() > configEndTime.getTime()) {
- throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
- }
-
- } catch (Exception e) {
- logger.error("姣旇緝璐圭敤鏃ユ湡澶辫触", e);
+ if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
+ if (newDate.getTime() > maxEndTime.getTime()) {
+ throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿,璇风敤鎸夌粨鏉熸椂闂存柟寮忕即璐�");
}
}
+
+ String selectUserAccount = reqJson.getString("selectUserAccount");
+ JSONArray params = JSONArray.parseArray(selectUserAccount);
+ for (int paramIndex = 0; paramIndex < params.size(); paramIndex++) {
+ JSONObject param = params.getJSONObject(paramIndex);
+ String maximumNumber = param.getString("maximumNumber");
+ }
+
+ //todo 鏄惁鎸夌即璐规椂闂存缂磋垂
+ validateIfPayFeeStartEndDate(reqJson, feeConfigDtos.get(0));
}
+
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject paramObj) throws CmdException {
-
logger.debug("paramObj : {}", paramObj);
+
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+
+ String cycles = paramObj.getString("cycles");
+ Date endTime = null;
+
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
String key = this.getClass().getSimpleName() + paramObj.get("feeId");
try {
DistributedLock.waitGetDistributedLock(key, requestId);
+ //todo 灏佽 缂磋垂璁板綍鎶ユ枃
JSONObject feeDetail = addFeeDetail(paramObj);
+ FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
+ endTime = feeInfo.getEndTime();
+ feeDetail.put("payableAmount", feeDetail.getString("receivableAmount"));
+ //todo 灏佽 淇敼璐圭敤鏃堕棿鎶ユ枃
+ JSONObject fee = modifyFee(paramObj);
+ payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
+ payFeeDetailPo.setReceivableAmount(feeDetail.getString("totalFeePrice"));
+ //鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
+ hasDiscount(paramObj, payFeePo, payFeeDetailPo);
+
+ // todo 澶勭悊鐢ㄦ埛璐︽埛
+ dealUserAccount(paramObj, payFeeDetailPo);
+
+ String oId = Java110TransactionalFactory.getOId();
+ if (StringUtil.isEmpty(oId)) {
+ oId = payFeeDetailPo.getDetailId();
+ }
+
+ payFeeDetailPo.setPayOrderId(oId);
+ payFeeDetailPo.setCashierId(userDtos.get(0).getUserId());
+ payFeeDetailPo.setCashierName(userDtos.get(0).getName());
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
}
- JSONObject fee = modifyFee(paramObj);
- payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
}
+ // todo 濡傛灉鏄寜 鑷畾涔夋椂闂存缂磋垂锛岃繖閲岃ˉ涓�鏉＄即璐硅褰� 鍜� 娆犺垂璐圭敤
+ ifCustomStartEndTimePayFee(cycles, endTime, payFeeDetailPo, payFeePo, paramObj);
+ } catch (ParseException e) {
+ e.printStackTrace();
} finally {
- DistributedLock.releaseDistributedLock(requestId, key);
+ DistributedLock.releaseDistributedLock(key, requestId);
}
//璐︽埛澶勭悊
dealAccount(paramObj);
@@ -207,7 +273,8 @@
JSONObject discountBusiness = null;
JSONArray selectDiscounts = paramObj.getJSONArray("selectDiscount");
for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
- addPayFeeDetailDiscount(paramObj, selectDiscounts.getJSONObject(discountIndex));
+ JSONObject param = selectDiscounts.getJSONObject(discountIndex);
+ addPayFeeDetailDiscount(paramObj, param);
}
}
@@ -232,18 +299,156 @@
}
}
-// //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
+ //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
-// feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
-// List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
-//
-// if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
-// cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
-// return;
-// }
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
+ }
+
+
+ private void dealUserAccount(JSONObject paramObj, PayFeeDetailPo payFeeDetailPo) {
+ //鍒ゆ柇閫夋嫨鐨勮处鍙�
+ JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
+ if (jsonArray == null || jsonArray.size() < 1) {
+ return;
+ }
+
+ BigDecimal integralSum = new BigDecimal(0);
+ BigDecimal cashSum = new BigDecimal(0);
+
+ for (int columnIndex = 0; columnIndex < jsonArray.size(); columnIndex++) {
+ JSONObject param = jsonArray.getJSONObject(columnIndex);
+ //璐︽埛閲戦
+ BigDecimal amount = new BigDecimal(param.getString("amount"));
+ if (AccountDto.ACCT_TYPE_INTEGRAL.equals(param.getString("acctType"))) { //绉垎璐︽埛
+ //鑾峰彇鏈�澶ф姷鎵ｇН鍒�
+ BigDecimal maximumNumber = new BigDecimal(param.getString("maximumNumber"));
+ //鑾峰彇绉垎鎶垫墸
+ BigDecimal deductionProportion = new BigDecimal(param.getString("deductionProportion"));
+ int flag = amount.compareTo(maximumNumber);
+ BigDecimal redepositAmount = new BigDecimal("0.00");
+ if (flag == 1) { //璐︽埛绉垎澶т簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
+ redepositAmount = maximumNumber;
+ }
+ if (flag > -1) { //璐︽埛绉垎澶т簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
+ redepositAmount = maximumNumber;
+ }
+ if (flag == -1) { //璐︽埛绉垎灏忎簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
+ redepositAmount = amount;
+ }
+ if (flag < 1) { //璐︽埛绉垎灏忎簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
+ redepositAmount = amount;
+ }
+ if (flag == 0) { //璐︽埛绉垎绛変簬鏈�澶т娇鐢ㄧН鍒�
+ redepositAmount = amount;
+ }
+ //璁＄畻绉垎鎹㈢畻鐨勯噾棰�
+ BigDecimal divide = redepositAmount.divide(deductionProportion);
+ BigDecimal receivedAmount = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+ //璁＄畻瀹炰粯閲戦
+ int flag2 = divide.compareTo(receivedAmount);
+ BigDecimal subtract = new BigDecimal("0.00");
+ //鐢熸垚鎶垫墸鏄庣粏璁板綍
+ if (flag2 == -1) { //绉垎鎹㈢畻閲戦灏忎簬瀹炰粯閲戦
+ subtract = receivedAmount.subtract(divide);
+ } else if (flag < 1) { //绉垎鎹㈢畻閲戦灏忎簬绛変簬瀹炰粯閲戦
+ subtract = receivedAmount.subtract(divide);
+ }
+ integralSum = integralSum.add(subtract);
+ payFeeDetailPo.setReceivedAmount(subtract.toString());
+ } else if (AccountDto.ACCT_TYPE_CASH.equals(param.getString("acctType"))) { //鐜伴噾璐︽埛
+ //瀹炴敹閲戦
+ BigDecimal receivedAmount = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+ int flag = amount.compareTo(receivedAmount);
+ BigDecimal redepositAmount = new BigDecimal(0.00);
+ if (flag == 1) { //鐜伴噾璐︽埛澶т簬瀹炴敹閲戦锛屽氨鐢ㄥ疄鏀堕噾棰�
+ redepositAmount = receivedAmount;
+ }
+ if (flag > -1) { //鐜伴噾璐︽埛澶т簬绛変簬瀹炴敹閲戦锛屽氨鐢ㄥ疄鏀堕噾棰�
+ redepositAmount = receivedAmount;
+ }
+ if (flag == -1) { //鐜伴噾璐︽埛灏忎簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴�
+ redepositAmount = amount;
+ }
+ if (flag < 1) { //鐜伴噾璐︽埛灏忎簬绛変簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴�
+ redepositAmount = amount;
+ }
+ if (flag == 0) { //鐜伴噾璐︽埛绛変簬瀹炴敹閲戦
+ redepositAmount = amount;
+ }
+ cashSum = cashSum.add(redepositAmount);
+
+ }
+
+ // todo 濡傛灉绉垎澶т簬0
+ if (integralSum.doubleValue() > 0) {
+ FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
+ feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
+ feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
+ feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
+ feeAccountDetailPo.setAmount(integralSum.doubleValue() + "");
+ feeAccountDetailPo.setState("1003"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
+ feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
+ }
+ if (cashSum.doubleValue() > 0) {
+ //鐢熸垚鎶垫墸鏄庣粏璁板綍
+ FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
+ feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
+ feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
+ feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
+ feeAccountDetailPo.setState("1002"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
+ feeAccountDetailPo.setAmount(cashSum.doubleValue() + ""); //鐜伴噾鎶垫墸閲戦
+ feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
+ BigDecimal receivedAmountDec = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+ receivedAmountDec = receivedAmountDec.subtract(cashSum);
+ payFeeDetailPo.setReceivedAmount(receivedAmountDec.doubleValue() + "");
+ }
+ }
+ }
+
+ /**
+ * 鏀归�犺禒閫侀�昏緫 if 宓屽鏈夌偣澶� 浼樺寲
+ *
+ * @param paramObj
+ * @param payFeePo
+ * @param payFeeDetailPo
+ * @throws ParseException
+ */
+ private void hasDiscount(JSONObject paramObj, PayFeePo payFeePo, PayFeeDetailPo payFeeDetailPo) throws ParseException {
+ if (!paramObj.containsKey("selectDiscount")) {
+ return;
+ }
+ JSONArray selectDiscount = paramObj.getJSONArray("selectDiscount");
+
+ if (selectDiscount == null || selectDiscount.size() < 1) {
+ return;
+ }
+ for (int index = 0; index < selectDiscount.size(); index++) {
+ JSONObject paramJson = selectDiscount.getJSONObject(index);
+ if (!"102020008".equals(paramJson.getString("ruleId"))) { //璧犻�佽鍒�
+ continue;
+ }
+ JSONArray feeDiscountSpecs = paramJson.getJSONArray("feeDiscountSpecs");
+ if (feeDiscountSpecs == null || feeDiscountSpecs.size() < 1) {
+ continue;
+ }
+ for (int specIndex = 0; specIndex < feeDiscountSpecs.size(); specIndex++) {
+ JSONObject paramIn = feeDiscountSpecs.getJSONObject(specIndex);
+ if (!"89002020980015".equals(paramIn.getString("specId"))) { //璧犻�佹湀浠�
+ continue;
+ }
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String specValue = paramIn.getString("specValue");
+ //鑾峰彇璐圭敤缁撴潫鏃堕棿(涔熷氨鏄笅娆¤垂鐢ㄥ紑濮嬫椂闂�)
+ Date endTime = df.parse(payFeeDetailPo.getEndTime());
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(endTime);
+ cal.add(Calendar.MONTH, Integer.parseInt(specValue));
+ payFeeDetailPo.setEndTime(df.format(cal.getTime()));
+ payFeePo.setEndTime(df.format(cal.getTime()));
+ }
+ }
}
/**
@@ -340,45 +545,115 @@
*/
private void updateCarEndTime(JSONObject paramObj) {
int flag;
- if (paramObj.containsKey("carPayerObjType") && FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
- Date feeEndTime = (Date) paramObj.get("carFeeEndTime");
- OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setCommunityId(paramObj.getString("communityId"));
- ownerCarDto.setCarId(paramObj.getString("carPayerObjId"));
- ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
- List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富閿欒锛�");
- //鑾峰彇杞︿綅id
- String psId = ownerCarDtos.get(0).getPsId();
- //鑾峰彇杞﹁締鐘舵��(1001 姝ｅ父鐘舵�侊紝2002 娆犺垂鐘舵�� 3003 杞︿綅閲婃斁)
- String carState = ownerCarDtos.get(0).getState();
- if (!StringUtil.isEmpty(psId) && !StringUtil.isEmpty(carState) && carState.equals("3003")) {
- ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setPsId(psId);
- List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
- //鑾峰彇杞︿綅鐘舵��(鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F)
- String state = parkingSpaceDtos.get(0).getState();
- if (!StringUtil.isEmpty(state) && !state.equals("F")) {
- throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
- }
+ FeeDto feeDto = new FeeDto();
+ feeDto.setFeeId(paramObj.getString("feeId"));
+ feeDto.setCommunityId(paramObj.getString("communityId"));
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+ if (feeDtos == null || feeDtos.size() < 1) {
+ return;
+ }
+ if (!FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDtos.get(0).getPayerObjType())) {
+ return;
+ }
+ Date feeEndTime = feeDtos.get(0).getEndTime();
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(paramObj.getString("communityId"));
+ ownerCarDto.setCarId(feeDtos.get(0).getPayerObjId());
+ ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+ if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+ return;
+ }
+ //鑾峰彇杞︿綅id
+ String psId = ownerCarDtos.get(0).getPsId();
+ //鑾峰彇杞﹁締鐘舵��(1001 姝ｅ父鐘舵�侊紝2002 娆犺垂鐘舵�� 3003 杞︿綅閲婃斁)
+ boolean sonMotherParking = false;
+ String num = "";
+ String carState = ownerCarDtos.get(0).getState();
+ if (!StringUtil.isEmpty(psId) && "3003".equals(carState)) {
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setPsId(psId);
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
+ //鑾峰彇杞︿綅鐘舵��(鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F)
+ String state = parkingSpaceDtos.get(0).getState();
+ if (!StringUtil.isEmpty(state) && !state.equals("F")) {
+ throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
}
- //杞︿綅璐圭敤缁
- if (ownerCarDtos != null) {
- for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
- if (tmpOwnerCarDto.getEndTime().getTime() >= feeEndTime.getTime()) {
- continue;
- }
- OwnerCarPo ownerCarPo = new OwnerCarPo();
- ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
- ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
- flag = ownerCarNewV1InnerServiceSMOImpl.updateOwnerCarNew(ownerCarPo);
- if (flag < 1) {
- throw new CmdException("缂磋垂澶辫触");
- }
- }
+
+ if (ParkingSpaceDto.TYPE_CD_SON_MOTHER.equals(parkingSpaceDtos.get(0).getTypeCd())
+ && !parkingSpaceDtos.get(0).getTypeCd().contains(ParkingSpaceDto.NUM_MOTHER)
+ ) {
+ sonMotherParking = true;
+ num = parkingSpaceDtos.get(0).getNum();
}
}
+
+ // todo 瀛楁瘝杞︿綅锛屽瓙杞︿綅缂磋垂 姣嶈溅浣嶅欢鏈�
+ if (sonMotherParking) {
+ queryMotherOwnerCars(num, ownerCarDtos, psId);
+ }
+
+
+ Calendar endTimeCalendar = null;
+ //杞︿綅璐圭敤缁
+ for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+ //鍚庝粯璐� 鎴栬�呬俊鐢ㄦ湡杞﹁締 鍔犱竴涓湀
+ if (FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())
+ || OwnerCarDto.CAR_TYPE_CREDIT.equals(tmpOwnerCarDto.getCarType())) {
+ endTimeCalendar = Calendar.getInstance();
+ endTimeCalendar.setTime(feeEndTime);
+ endTimeCalendar.add(Calendar.MONTH, 1);
+ feeEndTime = endTimeCalendar.getTime();
+ }
+ if (tmpOwnerCarDto.getEndTime().getTime() >= feeEndTime.getTime()) {
+ continue;
+ }
+ OwnerCarPo ownerCarPo = new OwnerCarPo();
+ ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
+ ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
+ flag = ownerCarNewV1InnerServiceSMOImpl.updateOwnerCarNew(ownerCarPo);
+ if (flag < 1) {
+ throw new CmdException("缂磋垂澶辫触");
+ }
+ }
+
+
+ }
+
+ /**
+ * 瀛愭瘝杞︿綅寤舵湡 姣嶈溅浣嶄篃闇�瑕佸欢鏈�
+ *
+ * @param num
+ * @param ownerCarDtos
+ */
+ private void queryMotherOwnerCars(String num, List<OwnerCarDto> ownerCarDtos, String paId) {
+
+ String sonMotherSwitch = CommonCache.getValue("SON_MOTHER_PARKING_AUTO_FEE");
+
+ if (!"ON".equals(sonMotherSwitch)) {
+ return;
+ }
+
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setNum(num + ParkingSpaceDto.NUM_MOTHER);
+ parkingSpaceDto.setPaId(paId);
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
+
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(parkingSpaceDtos.get(0).getCommunityId());
+ ownerCarDto.setPsId(parkingSpaceDtos.get(0).getPsId());
+ ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
+ List<OwnerCarDto> tmpOwnerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+ if (ownerCarDtos == null) {
+ ownerCarDtos = new ArrayList<>();
+ }
+
+ ownerCarDtos.addAll(tmpOwnerCarDtos);
}
@@ -412,11 +687,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addFeeDetail(JSONObject paramInJson) {
- String remark = paramInJson.getString("remark");
- if (!StringUtil.isEmpty(remark)) {
- remark = "-" + remark;
- }
- paramInJson.put("remark", "鐜板満鏀堕摱鍙版敮浠�" + remark);
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
@@ -441,7 +711,7 @@
BigDecimal cycles = null;
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
- if ("-101".equals(paramInJson.getString("cycles"))) {
+ if ("-101".equals(paramInJson.getString("cycles"))) { // 鑷畾涔夐噾棰濅氦璐�
Date endTime = feeDto.getEndTime();
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
@@ -451,13 +721,78 @@
targetEndTime = endCalender.getTime();
paramInJson.put("tmpCycles", cycles.doubleValue());
businessFeeDetail.put("cycles", cycles.doubleValue());
- businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
- } else {
- targetEndTime = computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, paramInJson.getString("cycles"));
+ //澶勭悊 鍙兘杩樺瓨鍦� 瀹炴敹鎵嬪伐鍑忓厤鐨勬儏鍐�
+ if (paramInJson.containsKey("receivableAmount") && !StringUtil.isEmpty(paramInJson.getString("receivableAmount"))) {
+ businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
+ } else {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ //todo 濡傛灉搴旀敹灏忎簬瀹炴敹锛屽皢搴旀敹鍒蜂负 瀹炴敹
+ if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ } else if ("-103".equals(paramInJson.getString("cycles"))) { //杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
+ String custEndTime = paramInJson.getString("custEndTime");
+ Date endDates = DateUtil.getDateFromStringB(custEndTime);
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ targetEndTime = endDates;
+ BigDecimal receivedAmount1 = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
+ cycles = receivedAmount1.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
+ paramInJson.put("tmpCycles", cycles.doubleValue());
+ businessFeeDetail.put("cycles", cycles.doubleValue());
+ BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
+ //澶勭悊 鍙兘杩樺瓨鍦� 瀹炴敹鎵嬪伐鍑忓厤鐨勬儏鍐�
+ if (paramInJson.containsKey("receivableAmount") && !StringUtil.isEmpty(paramInJson.getString("receivableAmount"))) {
+ businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
+ } else {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ //todo 濡傛灉搴旀敹灏忎簬瀹炴敹锛屽皢搴旀敹鍒蜂负 瀹炴敹
+ if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ } else if ("-105".equals(paramInJson.getString("cycles"))) { //杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
+ String customEndTime = paramInJson.getString("customEndTime");
+ Date endDates = DateUtil.getDateFromStringB(customEndTime);
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ targetEndTime = endDates;
+ BigDecimal receivedAmount1 = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
+ cycles = receivedAmount1.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
+ paramInJson.put("tmpCycles", cycles.doubleValue());
+ businessFeeDetail.put("cycles", cycles.doubleValue());
+ BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
+ //澶勭悊 鍙兘杩樺瓨鍦� 瀹炴敹鎵嬪伐鍑忓厤鐨勬儏鍐�
+ if (paramInJson.containsKey("receivableAmount") && !StringUtil.isEmpty(paramInJson.getString("receivableAmount"))) {
+ businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
+ } else {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ //todo 濡傛灉搴旀敹灏忎簬瀹炴敹锛屽皢搴旀敹鍒蜂负 瀹炴敹
+ if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ //todo 鏀瑰啓寮�濮嬫椂闂�
+ businessFeeDetail.put("startTime", paramInJson.getString("customStartTime"));
+ } else { //鑷畾涔夊懆鏈�
+ targetEndTime = computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, paramInJson.getString("cycles"));//鏍规嵁缂磋垂鍛ㄦ湡璁＄畻 缁撴潫鏃堕棿
cycles = new BigDecimal(Double.parseDouble(paramInJson.getString("cycles")));
double tmpReceivableAmount = cycles.multiply(feePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
+ //鍑虹閫掑闂澶勭悊
+ if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeDto.getComputingFormula())) {
+ computeFeeSMOImpl.dealRentRateCycle(feeDto, cycles.doubleValue());
+ if (feeDto.getOweFee() > 0) {
+ businessFeeDetail.put("receivableAmount", feeDto.getAmountOwed());
+ }
+ }
}
+
businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(targetEndTime, DateUtil.DATE_FORMATE_STRING_A));
paramInJson.put("feeInfo", feeDto);
@@ -472,8 +807,25 @@
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
int hours = 0;
+ //-101鑷畾涔夐噾棰� -102鑷畾涔夊懆鏈� -103 鑷畾涔夌粨鏉熸椂闂�
if ("-101".equals(paramInJson.getString("cycles"))) {
endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
+ } else if ("-103".equals(paramInJson.getString("cycles"))) {
+ String custEndTime = paramInJson.getString("custEndTime");
+ Date endDates = DateUtil.getDateFromStringB(custEndTime);
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ endCalender.setTime(endDates);
+ } else if ("-105".equals(paramInJson.getString("cycles"))) {
+ String customEndTime = paramInJson.getString("customEndTime");
+ Date endDates = DateUtil.getDateFromStringB(customEndTime);
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ endCalender.setTime(endDates);
} else {
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
}
@@ -491,9 +843,25 @@
feeInfo.setState(FeeDto.STATE_FINISH);
}
feeInfo.setEndTime(endCalender.getTime());
+ Date maxEndTime = feeInfo.getDeadlineTime();
+ if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
+ maxEndTime = feeInfo.getConfigEndTime();
+ }
+
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeInfo.getFeeFlag())) {
+ maxEndTime = feeInfo.getMaxEndTime();
+ }
+
+ //濡傛灉闂存瓏鎬ц垂鐢ㄦ病鏈夎缃粨鏉熸椂闂� 鍒欏彇璐圭敤椤圭殑
+ if (maxEndTime == null) {
+ maxEndTime = feeInfo.getConfigEndTime();
+ }
+
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
- if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
- throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
+ if (maxEndTime != null) {
+ if (feeInfo.getEndTime().getTime() - maxEndTime.getTime() > 30 * 24 * 60 * 60 * 1000L) {
+ throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
+ }
}
Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
@@ -507,16 +875,15 @@
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
// 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
- if (FeeFlagTypeConstant.CYCLE.equals(feeInfo.getFeeFlag())) {
+ if (!FeeFlagTypeConstant.ONETIME.equals(feeInfo.getFeeFlag())) {
//杩欓噷 瀹归敊浜斿ぉ鏃堕棿
- Date configEndTime = feeInfo.getConfigEndTime();
Calendar calendar = Calendar.getInstance();
- calendar.setTime(configEndTime);
+ calendar.setTime(maxEndTime);
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());
+ maxEndTime = calendar.getTime();
+ if (feeInfo.getEndTime().after(maxEndTime)) {
+ businessFee.put("state", FeeDto.STATE_FINISH);
+ businessFee.put("endTime", maxEndTime);
}
}
return businessFee;
@@ -529,25 +896,92 @@
if (jsonArray == null || jsonArray.size() < 1) {
return;
}
- //搴旀敹娆� totalFeePrice
- BigDecimal totalFeePrice = new BigDecimal(paramObj.getString("totalFeePrice")); //搴旀敹娆�
- //瀹炴敹娆� receivedAmount
- BigDecimal receivedAmount = new BigDecimal(paramObj.getString("receivedAmount")); //瀹炴敹娆撅紙鎵ｆ閲戦锛�
-
- BigDecimal redepositAmount = new BigDecimal("0.00");//鎶垫墸閲戦
+ List<AccountDto> accountDtos = new ArrayList<>();
for (int columnIndex = 0; columnIndex < jsonArray.size(); columnIndex++) {
+ //搴旀敹娆� totalFeePrice
+ BigDecimal totalFeePrice = new BigDecimal(paramObj.getString("totalFeePrice")); //搴旀敹娆�
+ //瀹炴敹娆� receivedAmount
+ BigDecimal receivedAmount = new BigDecimal(paramObj.getString("receivedAmount")); //瀹炴敹娆撅紙鎵ｆ閲戦锛�
+ BigDecimal redepositAmount = new BigDecimal("0.00");//鎶垫墸閲戦
JSONObject param = jsonArray.getJSONObject(columnIndex);
+ if (!StringUtil.isEmpty(param.getString("acctType")) && param.getString("acctType").equals("2004")) { //绉垎璐︽埛
+ //鑾峰彇鎶垫墸姣斾緥
+ BigDecimal deductionProportion = new BigDecimal(param.getString("deductionProportion"));
+ //璁＄畻瀹炴敹娆炬墍鎵ｇ殑绉垎
+ BigDecimal multiply = receivedAmount.multiply(deductionProportion);
+ receivedAmount = multiply;
+ }
//璐︽埛閲戦
- BigDecimal amount = new BigDecimal(param.getString("amount")); //璐︽埛閲戦
+ BigDecimal amount = new BigDecimal(param.getString("amount"));
int flag = amount.compareTo(receivedAmount);
- if (flag == -1) {//璐︽埛閲戦灏忎簬瀹炴敹娆�
- receivedAmount = receivedAmount.subtract(amount);
+ if (flag == -1) { //璐︽埛閲戦灏忎簬瀹炴敹娆�
redepositAmount = amount;//鎶垫墸閲戦
} else {
redepositAmount = receivedAmount;//鎶垫墸閲戦
}
- //鍓╀綑閲戦
- amount.compareTo(receivedAmount);
+ if ("2004".equals(param.getString("acctType"))) {
+ //鑾峰彇鏈�澶ф姷鎵ｇН鍒�
+ BigDecimal maximumNumber = new BigDecimal(param.getString("maximumNumber"));
+ //鑾峰彇绉垎鎶垫墸
+ BigDecimal deductionProportion = new BigDecimal(param.getString("deductionProportion"));
+ int flag2 = amount.compareTo(maximumNumber);
+ if (flag2 == 1) { //璐︽埛绉垎澶т簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
+ int flag3 = maximumNumber.compareTo(receivedAmount);
+ if (flag3 == 1) { //濡傛灉鏈�澶т娇鐢ㄧН鍒嗗ぇ浜庡疄鏀堕噾棰濇姷鎵ｇН鍒嗭紝灏辨妸瀹炴敹閲戦鎶垫墸绉垎璧嬪�肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else if (flag3 > -1) {//濡傛灉鏈�澶т娇鐢ㄧН鍒嗗ぇ浜庣瓑浜庡疄鏀堕噾棰濇姷鎵ｇН鍒嗭紝灏辨妸瀹炴敹閲戦鎶垫墸绉垎璧嬪�肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else {
+ redepositAmount = maximumNumber;
+ }
+ }
+ if (flag2 > -1) { //璐︽埛绉垎澶т簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
+ int flag3 = maximumNumber.compareTo(receivedAmount);
+ if (flag3 == 1) { //濡傛灉鏈�澶т娇鐢ㄧН鍒嗗ぇ浜庡疄鏀堕噾棰濇姷鎵ｇН鍒嗭紝灏辨妸瀹炴敹閲戦鎶垫墸绉垎璧嬪�肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else if (flag3 > -1) {//濡傛灉鏈�澶т娇鐢ㄧН鍒嗗ぇ浜庣瓑浜庡疄鏀堕噾棰濇姷鎵ｇН鍒嗭紝灏辨妸瀹炴敹閲戦鎶垫墸绉垎璧嬪�肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else {
+ redepositAmount = maximumNumber;
+ }
+ }
+ if (flag2 == -1) { //璐︽埛绉垎灏忎簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
+ int flag3 = amount.compareTo(receivedAmount);
+ if (flag3 == 1) { //濡傛灉绉垎璐︽埛澶т簬瀹炴敹閲戦鎶垫墸绉垎锛屽氨鎶婂疄鏀堕噾棰濇姷鎵ｇН鍒嗚祴鍊肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else if (flag3 > -1) {//濡傛灉绉垎璐︽埛澶т簬绛変簬瀹炴敹閲戦鎶垫墸绉垎锛屽氨鎶婂疄鏀堕噾棰濇姷鎵ｇН鍒嗚祴鍊肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else {
+ redepositAmount = amount;
+ }
+ }
+ if (flag2 < 1) { //璐︽埛绉垎灏忎簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
+ int flag3 = amount.compareTo(receivedAmount);
+ if (flag3 == 1) { //濡傛灉绉垎璐︽埛澶т簬瀹炴敹閲戦鎶垫墸绉垎锛屽氨鎶婂疄鏀堕噾棰濇姷鎵ｇН鍒嗚祴鍊肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else if (flag3 > -1) {//濡傛灉绉垎璐︽埛澶т簬绛変簬瀹炴敹閲戦鎶垫墸绉垎锛屽氨鎶婂疄鏀堕噾棰濇姷鎵ｇН鍒嗚祴鍊肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else {
+ redepositAmount = amount;
+ }
+ }
+ if (flag2 == 0) { //璐︽埛绉垎绛変簬鏈�澶т娇鐢ㄧН鍒�
+ int flag3 = amount.compareTo(receivedAmount);
+ if (flag3 == 1) { //濡傛灉绉垎璐︽埛澶т簬瀹炴敹閲戦鎶垫墸绉垎锛屽氨鎶婂疄鏀堕噾棰濇姷鎵ｇН鍒嗚祴鍊肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else if (flag3 > -1) {//濡傛灉绉垎璐︽埛澶т簬绛変簬瀹炴敹閲戦鎶垫墸绉垎锛屽氨鎶婂疄鏀堕噾棰濇姷鎵ｇН鍒嗚祴鍊肩粰鎶垫墸绉垎
+ redepositAmount = receivedAmount;
+ } else {
+ redepositAmount = amount;
+ }
+ }
+ //璁＄畻绉垎鎹㈢畻鐨勯噾棰�
+ BigDecimal divide = redepositAmount.divide(deductionProportion);
+ BigDecimal divide1 = receivedAmount.divide(deductionProportion);
+ //璁＄畻杩橀渶鏀粯鐨勯噾棰�
+ BigDecimal subtract = divide1.subtract(divide);
+ paramObj.put("receivedAmount", subtract);
+ }
String acctId = param.getString("acctId");
if (StringUtil.isEmpty(acctId)) {
throw new IllegalArgumentException("璐︽埛id涓虹┖锛�");
@@ -555,7 +989,7 @@
AccountDto accountDto = new AccountDto();
accountDto.setAcctId(acctId);
//鏌ヨ璐︽埛閲戦
- List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+ accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
Assert.listOnlyOne(accountDtos, "鏌ヨ璐︽埛閲戦閿欒锛�");
if (accountDtos != null && accountDtos.size() > 0) {
AccountDto accountDto1 = accountDtos.get(0);
@@ -564,8 +998,6 @@
throw new UnsupportedOperationException("璐︽埛閲戦鎶垫墸涓嶈冻锛岃鎮ㄧ‘璁よ处鎴烽噾棰濓紒");
}
}
-
-
AccountDetailPo accountDetailPo = new AccountDetailPo();
accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
int flag1 = redepositAmount.compareTo(BigDecimal.ZERO);
@@ -586,8 +1018,151 @@
throw new CmdException("鎵ｆ澶辫触");
}
}
+ }
+ /**
+ * 鏍￠獙鏄惁鎸夌即璐规椂闂存缂磋垂
+ *
+ * @param reqJson
+ * @param feeConfigDto
+ */
+ private void validateIfPayFeeStartEndDate(JSONObject reqJson, FeeConfigDto feeConfigDto) {
+ if (!"-105".equals(reqJson.getString("cycles"))) {
+ return;
+ }
+ // todo 鑷繁鏄棿鎺ユ�ц垂鐢�
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDto.getFeeFlag())) {
+ return;
+ }
+
+ FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
+ tmpFeeConfigDto.setFeeNameEq(feeConfigDto.getFeeName() + "娆犺垂");
+ tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
+ tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
+
+ Assert.listOnlyOne(feeConfigDtos, "鎸夎嚜瀹氫箟鏃堕棿娈电即璐规椂锛岃垂鐢ㄥ繀椤讳负闂存帴鎬ц垂鐢紝鎴栬�呭瓨鍦ㄥ悕绉颁负 " + feeConfigDto.getFeeName() + "娆犺垂 鐨勯棿鎺ユ�ц垂鐢紝瀹冪殑鍏紡璁＄畻蹇呴』瑕佸拰" + feeConfigDto.getFeeName() + "涓�鑷�");
+ }
+
+
+ /**
+ * 鑷畾涔夋椂闂存 缂磋垂
+ *
+ * @param cycles
+ * @param endTime
+ * @param payFeeDetailPo
+ * @param payFeePo
+ */
+ private void ifCustomStartEndTimePayFee(String cycles, Date endTime, PayFeeDetailPo payFeeDetailPo, PayFeePo payFeePo, JSONObject reqJson) {
+ if (!"-105".equals(cycles)) {
+ return;
+ }
+
+ FeeDto feeInfo = (FeeDto) reqJson.get("feeInfo");
+ String payObjNameRemark = "鎴垮眿";
+ if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeInfo.getPayerObjType())) {
+ payObjNameRemark = "杞﹁締";
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeInfo.getPayerObjType())) {
+ payObjNameRemark = "鍚堝悓";
+ }
+
+ //todo 琛ュ厖涓�鏉� 缂磋垂璁板綍鏁版嵁
+ PayFeeDetailPo tmpPayFeeDetailPo = BeanConvertUtil.covertBean(payFeeDetailPo, PayFeeDetailPo.class);
+ tmpPayFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ tmpPayFeeDetailPo.setCycles("0");
+ tmpPayFeeDetailPo.setReceivableAmount("0");
+ tmpPayFeeDetailPo.setReceivedAmount("0");
+ tmpPayFeeDetailPo.setPayableAmount("0");
+ tmpPayFeeDetailPo.setStartTime(DateUtil.getFormatTimeStringB(endTime));
+ tmpPayFeeDetailPo.setEndTime(reqJson.getString("customStartTime"));
+ tmpPayFeeDetailPo.setState(FeeDetailDto.STATE_OWE);
+ tmpPayFeeDetailPo.setRemark("鎸夌即璐规椂闂存缂磋垂,杩欓儴鍒嗚垂鐢ㄦ寜娆犺垂鐨勬柟寮忛噸鏂扮敓鎴愶紝璇峰湪" + payObjNameRemark + "涓婃煡鐪�");
+ int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(tmpPayFeeDetailPo);
+
+ if (flag < 1) {
+ throw new CmdException("鐢熸垚娆犺垂澶辫触");
+ }
+
+ //todo 鐢熸垚璐圭敤
+ PayFeePo tmpPayFeePo = BeanConvertUtil.covertBean(feeInfo, PayFeePo.class);
+ tmpPayFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ tmpPayFeePo.setEndTime(DateUtil.getFormatTimeStringB(endTime));
+ tmpPayFeePo.setState(FeeDto.STATE_DOING);
+
+ // todo 澶勭悊configId
+ doChangeConfigId(tmpPayFeePo, feeInfo);
+
+
+ flag = payFeeV1InnerServiceSMOImpl.savePayFee(tmpPayFeePo);
+ if (flag < 1) {
+ throw new CmdException("鐢熸垚娆犺垂澶辫触");
+ }
+
+ //todo 琛ュ厖 璐圭敤灞炴��
+ FeeAttrDto feeAttrDto = new FeeAttrDto();
+ feeAttrDto.setFeeId(payFeePo.getFeeId());
+ feeAttrDto.setCommunityId(payFeePo.getCommunityId());
+ List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
+
+ if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+ return;
+ }
+
+ List<FeeAttrPo> tmpFeeAttrPos = new ArrayList<>();
+ FeeAttrPo tmpFeeAttrPo = null;
+ boolean hasDeadLineTime = false;
+ for (FeeAttrDto tmpFeeAttrDto : feeAttrDtos) {
+ tmpFeeAttrDto.setFeeId(tmpPayFeePo.getFeeId());
+ tmpFeeAttrDto.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
+
+ if (FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
+ tmpFeeAttrDto.setValue(reqJson.getString("customStartTime"));
+ hasDeadLineTime = true;
+ }
+ tmpFeeAttrPo = BeanConvertUtil.covertBean(tmpFeeAttrDto, FeeAttrPo.class);
+ tmpFeeAttrPos.add(tmpFeeAttrPo);
+ }
+ //todo 娌℃湁缁撴潫鏃堕棿鏃�
+ if(!hasDeadLineTime){
+ tmpFeeAttrPo = new FeeAttrPo();
+ tmpFeeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
+ tmpFeeAttrPo.setFeeId(tmpPayFeePo.getFeeId());
+ tmpFeeAttrPo.setCommunityId(tmpFeeAttrPo.getCommunityId());
+ tmpFeeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+ tmpFeeAttrPo.setValue(reqJson.getString("customStartTime"));
+ tmpFeeAttrPos.add(tmpFeeAttrPo);
+ }
+
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(tmpFeeAttrPos);
+
+ }
+
+ /**
+ * 澶勭悊璐圭敤椤笽D
+ *
+ * @param tmpPayFeePo
+ * @param feeInfo
+ */
+ private void doChangeConfigId(PayFeePo tmpPayFeePo, FeeDto feeInfo) {
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setConfigId(feeInfo.getConfigId());
+ feeConfigDto.setCommunityId(feeInfo.getCommunityId());
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪");
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ return;
+ }
+
+
+ FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
+ tmpFeeConfigDto.setFeeNameEq(feeConfigDtos.get(0).getFeeName() + "娆犺垂");
+ tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
+ tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
+ //todo 鏍￠獙鐨勬椂鍊欐牎楠岃繃浜� 鎵�浠ヨ繖閲屼笉鍙兘涓虹┖
+ feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
+
+ tmpPayFeePo.setConfigId(feeConfigDtos.get(0).getConfigId());
}
private static Calendar getTargetEndTime(Calendar endCalender, Double cycles) {
--
Gitblit v1.8.0