From 4ce807bb99088dc6f41262046830fc872e772be4 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期二, 02 九月 2025 14:23:33 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 689 +++++++++++++-------------------------------------------
1 files changed, 165 insertions(+), 524 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 0c01f03..d9ee08f 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -19,6 +20,7 @@
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.user.UserDto;
+import com.java110.fee.bmo.fee.IFinishFeeNotify;
import com.java110.fee.smo.impl.FeeReceiptInnerServiceSMOImpl;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.community.*;
@@ -44,6 +46,7 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.text.ParseException;
@@ -118,6 +121,12 @@
@Autowired
private FeeReceiptInnerServiceSMOImpl feeReceiptInnerServiceSMOImpl;
+ @Autowired
+ private IFeeDiscountInnerServiceSMO feeDiscountInnerServiceSMOImpl;
+
+ @Autowired
+ private IFinishFeeNotify finishFeeNotifyImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
@@ -128,6 +137,15 @@
Assert.hasLength(reqJson.getString("cycles"), "鍛ㄦ湡涓嶈兘涓虹┖");
Assert.hasLength(reqJson.getString("receivedAmount"), "瀹炴敹閲戦涓嶈兘涓虹┖");
Assert.hasLength(reqJson.getString("feeId"), "璐圭敤ID涓嶈兘涓虹┖");
+
+ //褰撴敮浠樻柟寮忎负杞处鏃讹紝闇�瑕佹牎楠岃浆璐︿汉鏄惁涓虹┖
+ String primeRate = reqJson.getString("primeRate");
+ if(!StringUtils.isEmpty(primeRate) && primeRate.equals("7")){
+ String transferorName = reqJson.getString("transferorName");
+ if(StringUtils.isEmpty(transferorName)){
+ Assert.hasLength(reqJson.getString("transferorName"), "鏀粯鏂瑰紡涓鸿浆璐︽椂锛岃浆璐︿汉涓嶈兘涓虹┖");
+ }
+ }
//鍒ゆ柇鏄惁 璐圭敤鐘舵�佷负缂磋垂缁撴潫
FeeDto feeDto = new FeeDto();
feeDto.setFeeId(reqJson.getString("feeId"));
@@ -139,7 +157,7 @@
feeDto = feeDtos.get(0);
if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
- throw new IllegalArgumentException("鏀惰垂宸茬粡缁撴潫锛屼笉鑳藉啀缂磋垂");
+ throw new CmdException("鏀惰垂宸茬粡缁撴潫锛屼笉鑳藉啀缂磋垂");
}
Date endTime = feeDto.getEndTime();
@@ -148,49 +166,55 @@
feeConfigDto.setConfigId(feeDto.getConfigId());
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
-
- if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
- throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
+ if (ListUtil.isNull(feeConfigDtos)) {
+ throw new CmdException("璐圭敤椤逛笉瀛樺湪");
}
- //涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
+ // 鑾峰彇璐圭敤缁撴潫鏃堕棿
Date maxEndTime = feeDtos.get(0).getDeadlineTime();
//鍛ㄦ湡鎬ц垂鐢�
- if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (maxEndTime == null) {
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();
-// }
- if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeDtos.get(0).getFeeFlag())) {
Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
+ //todo 杩欓噷鍔犱竴澶� 鍥犱负灏戜竴绉�
+ maxEndTime = DateUtil.stepDay(maxEndTime, 1);
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);
+ JSONArray selectUserAccount = reqJson.getJSONArray("selectUserAccount");
+ for (int paramIndex = 0; paramIndex < selectUserAccount.size(); paramIndex++) {
+ JSONObject param = selectUserAccount.getJSONObject(paramIndex);
String maximumNumber = param.getString("maximumNumber");
}
+
//todo 鏄惁鎸夌即璐规椂闂存缂磋垂
validateIfPayFeeStartEndDate(reqJson, feeConfigDtos.get(0));
+
+ //todo 鏍￠獙 浼樻儬
+ JSONArray selectDiscounts = reqJson.getJSONArray("selectDiscount");
+ if (!ListUtil.isNull(selectDiscounts)) {
+ for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
+ JSONObject param = selectDiscounts.getJSONObject(discountIndex);
+ Assert.hasKeyAndValue(param, "discountId", "鏈寘鍚紭鎯營D");
+ Assert.hasKeyAndValue(param, "discountPrice", "鏈寘鍚紭鎯犻噾棰�");
+ }
+ }
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject paramObj) throws CmdException {
+
logger.debug("paramObj : {}", paramObj);
String payOrderId = paramObj.getString("payOrderId");
- String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
UserDto userDto = new UserDto();
userDto.setUserId(userId);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
@@ -212,19 +236,22 @@
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"));
//todo 缂撳瓨鏀舵嵁缂栧彿
CommonCache.setValue(payFeeDetailPo.getDetailId() + CommonCache.RECEIPT_CODE, receiptCode, CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
- //todo 鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
- hasDiscount(paramObj, payFeePo, payFeeDetailPo);
+ //todo 灏佽 淇敼璐圭敤鏃堕棿鎶ユ枃
+ JSONObject fee = modifyFee(paramObj, payFeeDetailPo);
+ payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
+
+ //todo 鍒ゆ柇鏄惁鏈夋姌鎵ｈ鍒�
+ hasDiscount(paramObj, payFeePo, payFeeDetailPo, feeInfo);
// todo 澶勭悊鐢ㄦ埛璐︽埛
dealUserAccount(paramObj, payFeeDetailPo);
+
String oId = Java110TransactionalFactory.getOId();
if (StringUtil.isEmpty(oId)) {
@@ -239,29 +266,13 @@
payFeeDetailPo.setCashierId(userDtos.get(0).getUserId());
payFeeDetailPo.setCashierName(userDtos.get(0).getName());
payFeeDetailPo.setOpenInvoice("N");
- if (!StringUtil.isEmpty(paramObj.getString("cashAmount")) && !StringUtil.isEmpty(paramObj.getString("integralAmount"))) {
- BigDecimal cashAmount = new BigDecimal(paramObj.getString("cashAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
- BigDecimal integralAmount = new BigDecimal(paramObj.getString("integralAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
- if (!StringUtil.isEmpty(payFeeDetailPo.getRemark())) {
- payFeeDetailPo.setRemark(payFeeDetailPo.getRemark() + "锛岀幇閲戣处鎴锋姷鎵�" + cashAmount + "鍏冿紝绉垎璐︽埛鎶垫墸" + integralAmount + "鍏�");
- } else {
- payFeeDetailPo.setRemark("鐜伴噾璐︽埛鎶垫墸" + cashAmount + "鍏冿紝绉垎璐︽埛鎶垫墸" + integralAmount + "鍏�");
- }
- }
- if (!StringUtil.isEmpty(paramObj.getString("cashAmount")) && StringUtil.isEmpty(paramObj.getString("integralAmount"))) {
+
+ if (!StringUtil.isEmpty(paramObj.getString("cashAmount"))) {
BigDecimal cashAmount = new BigDecimal(paramObj.getString("cashAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
if (!StringUtil.isEmpty(payFeeDetailPo.getRemark())) {
payFeeDetailPo.setRemark(payFeeDetailPo.getRemark() + "锛岀幇閲戣处鎴锋姷鎵�" + cashAmount + "鍏�");
} else {
payFeeDetailPo.setRemark("鐜伴噾璐︽埛鎶垫墸" + cashAmount + "鍏�");
- }
- }
- if (StringUtil.isEmpty(paramObj.getString("cashAmount")) && !StringUtil.isEmpty(paramObj.getString("integralAmount"))) {
- BigDecimal integralAmount = new BigDecimal(paramObj.getString("integralAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
- if (!StringUtil.isEmpty(payFeeDetailPo.getRemark())) {
- payFeeDetailPo.setRemark(payFeeDetailPo.getRemark() + "锛岀Н鍒嗚处鎴锋姷鎵�" + integralAmount + "鍏�");
- } else {
- payFeeDetailPo.setRemark("绉垎璐︽埛鎶垫墸" + integralAmount + "鍏�");
}
}
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
@@ -280,24 +291,17 @@
} finally {
DistributedLock.releaseDistributedLock(key, requestId);
}
- //璐︽埛澶勭悊
+ //todo 璐︽埛澶勭悊
dealAccount(paramObj);
- //鎶樻墸绠＄悊
- if (paramObj.containsKey("selectDiscount")) {
- JSONObject discountBusiness = null;
- JSONArray selectDiscounts = paramObj.getJSONArray("selectDiscount");
- for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
- JSONObject param = selectDiscounts.getJSONObject(discountIndex);
- addPayFeeDetailDiscount(paramObj, param);
- }
- }
- //涓哄仠杞﹁垂鍗曠嫭澶勭悊
- updateCarEndTime(paramObj);
+ //todo 涓哄仠杞﹁垂鍗曠嫭澶勭悊
+ finishFeeNotifyImpl.updateCarEndTime(paramObj.getString("feeId"), paramObj.getString("communityId"));
- //澶勭悊鎶ヤ慨鍗�
- doDealRepairOrder(paramObj);
+ //todo 淇敼鎶ヤ慨鍗�
+ finishFeeNotifyImpl.updateRepair(paramObj.getString("feeId"), paramObj.getString("communityId"), paramObj.getString("receivedAmount"));
+ //todo 绉熼噾寤舵湡鎴垮眿缁撴潫鏃堕棿
+ finishFeeNotifyImpl.updateRoomEndTime(paramObj.getString("feeId"), paramObj.getString("communityId"));
//淇敼鎶樻墸鐢宠鐘舵�侊紝绌虹疆鎴挎姌鎵ｅ彧鑳界敤涓�娆�
String selectDiscount = paramObj.getString("selectDiscount");
@@ -325,98 +329,51 @@
private void dealUserAccount(JSONObject paramObj, PayFeeDetailPo payFeeDetailPo) {
//鍒ゆ柇閫夋嫨鐨勮处鍙�
JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
- if (jsonArray == null || jsonArray.size() < 1) {
+ if (ListUtil.isNull(jsonArray)) {
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");
+
+ //瀹炴敹閲戦
+ 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);
+
+ if (cashSum.doubleValue() > 0) {
//鐢熸垚鎶垫墸鏄庣粏璁板綍
- if (flag2 == -1) { //绉垎鎹㈢畻閲戦灏忎簬瀹炰粯閲戦
- subtract = receivedAmount.subtract(divide);
- } else if (flag < 1) { //绉垎鎹㈢畻閲戦灏忎簬绛変簬瀹炰粯閲戦
- subtract = receivedAmount.subtract(divide);
- }
-// integralSum = integralSum.add(subtract);
- payFeeDetailPo.setReceivedAmount(subtract.toString());
- integralSum = integralSum.add(divide);
- // 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);
- }
- } 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);
- 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() + "");
- }
+ 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() + "");
+ payFeeDetailPo.setAcctAmount(cashSum.doubleValue() + "");
}
}
}
@@ -429,22 +386,23 @@
* @param payFeeDetailPo
* @throws ParseException
*/
- private void hasDiscount(JSONObject paramObj, PayFeePo payFeePo, PayFeeDetailPo payFeeDetailPo) throws ParseException {
+ private void hasDiscount(JSONObject paramObj, PayFeePo payFeePo, PayFeeDetailPo payFeeDetailPo, FeeDto feeDto) throws ParseException {
if (!paramObj.containsKey("selectDiscount")) {
return;
}
- JSONArray selectDiscount = paramObj.getJSONArray("selectDiscount");
+ JSONArray selectDiscounts = paramObj.getJSONArray("selectDiscount");
- if (selectDiscount == null || selectDiscount.size() < 1) {
+ if (ListUtil.isNull(selectDiscounts)) {
return;
}
- for (int index = 0; index < selectDiscount.size(); index++) {
- JSONObject paramJson = selectDiscount.getJSONObject(index);
+ Map feePriceMap = computeFeeSMOImpl.getFeePrice(feeDto);
+ for (int index = 0; index < selectDiscounts.size(); index++) {
+ JSONObject paramJson = selectDiscounts.getJSONObject(index);
if (!"102020008".equals(paramJson.getString("ruleId"))) { //璧犻�佽鍒�
continue;
}
JSONArray feeDiscountSpecs = paramJson.getJSONArray("feeDiscountSpecs");
- if (feeDiscountSpecs == null || feeDiscountSpecs.size() < 1) {
+ if (ListUtil.isNull(feeDiscountSpecs)) {
continue;
}
for (int specIndex = 0; specIndex < feeDiscountSpecs.size(); specIndex++) {
@@ -461,215 +419,19 @@
cal.add(Calendar.MONTH, Integer.parseInt(specValue));
payFeeDetailPo.setEndTime(df.format(cal.getTime()));
payFeePo.setEndTime(df.format(cal.getTime()));
- }
- }
- }
- /**
- * 澶勭悊鎶ヤ慨鍗�
- *
- * @param paramObj
- */
- private void doDealRepairOrder(JSONObject paramObj) {
- int flag;//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
- FeeAttrDto feeAttrDto = new FeeAttrDto();
- feeAttrDto.setCommunityId(paramObj.getString("communityId"));
- feeAttrDto.setFeeId(paramObj.getString("feeId"));
- feeAttrDto.setSpecCd(FeeAttrDto.SPEC_CD_REPAIR);
- List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
- //淇敼 娲惧崟鐘舵��
- if (feeAttrDtos != null && feeAttrDtos.size() > 0) {
- RepairDto repairDto = new RepairDto();
- repairDto.setRepairId(feeAttrDtos.get(0).getValue());
- //鏌ヨ鎶ヤ慨璁板綍
- List<RepairDto> repairDtos = repairInnerServiceSMO.queryRepairs(repairDto);
- Assert.listOnlyOne(repairDtos, "鎶ヤ慨淇℃伅閿欒锛�");
- //鑾峰彇鎶ヤ慨娓犻亾
- String repairChannel = repairDtos.get(0).getRepairChannel();
- RepairPoolPo repairPoolPo = new RepairPoolPo();
- repairPoolPo.setRepairId(feeAttrDtos.get(0).getValue());
- repairPoolPo.setCommunityId(paramObj.getString("communityId"));
- if (repairChannel.equals("Z")) { //濡傛灉鏄笟涓昏嚜涓绘姤淇紝鐘舵�佸氨鍙樻垚寰呰瘎浠�
- repairPoolPo.setState(RepairDto.STATE_APPRAISE);
- } else { //濡傛灉鏄憳宸ヤ唬瀹㈡姤淇垨鐢佃瘽鎶ヤ慨锛岀姸鎬佸氨鍙樻垚寰呭洖璁�
- repairPoolPo.setState(RepairDto.STATE_RETURN_VISIT);
- }
- flag = repairPoolNewV1InnerServiceSMOImpl.updateRepairPoolNew(repairPoolPo);
- if (flag < 1) {
- throw new CmdException("鏇存柊寰俊娲惧崟姹犱俊鎭け璐�");
- }
-
- repairDto = new RepairDto();
- repairDto.setRepairId(feeAttrDtos.get(0).getValue());
- //鏌ヨ鎶ヤ慨璁板綍
- repairDtos = repairInnerServiceSMO.queryRepairs(repairDto);
-
- Assert.listOnlyOne(repairDtos, "鎶ヤ慨淇℃伅閿欒锛�");
- //鑾峰彇鎶ヤ慨娓犻亾
- repairChannel = repairDtos.get(0).getRepairChannel();
- RepairUserDto repairUserDto = new RepairUserDto();
- repairUserDto.setRepairId(feeAttrDtos.get(0).getValue());
- repairUserDto.setState(RepairUserDto.STATE_PAY_FEE);
- //鏌ヨ寰呮敮浠樼姸鎬佺殑璁板綍
- List<RepairUserDto> repairUserDtoList = repairUserInnerServiceSMO.queryRepairUsers(repairUserDto);
- Assert.listOnlyOne(repairUserDtoList, "淇℃伅閿欒锛�");
- RepairUserPo repairUserPo = new RepairUserPo();
- repairUserPo.setRuId(repairUserDtoList.get(0).getRuId());
- if ("Z".equals(repairChannel)) { //濡傛灉涓氫富鏄嚜涓绘姤淇紝鐘舵�佸氨鍙樻垚宸叉敮浠橈紝骞舵柊澧炰竴鏉″緟璇勪环鐘舵��
- repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
- //濡傛灉鏄緟璇勪环鐘舵�侊紝灏辨洿鏂扮粨鏉熸椂闂�
- repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUserPo.setContext("宸叉敮浠�" + paramObj.getString("feePrice") + "鍏�");
- //鏂板寰呰瘎浠风姸鎬�
- RepairUserPo repairUser = new RepairUserPo();
- repairUser.setRuId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId));
- repairUser.setStartTime(repairUserPo.getEndTime());
- repairUser.setState(RepairUserDto.STATE_EVALUATE);
- repairUser.setContext("寰呰瘎浠�");
- repairUser.setCommunityId(paramObj.getString("communityId"));
- repairUser.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUser.setRepairId(repairUserDtoList.get(0).getRepairId());
- repairUser.setStaffId(repairUserDtoList.get(0).getStaffId());
- repairUser.setStaffName(repairUserDtoList.get(0).getStaffName());
- repairUser.setPreStaffId(repairUserDtoList.get(0).getStaffId());
- repairUser.setPreStaffName(repairUserDtoList.get(0).getStaffName());
- repairUser.setPreRuId(repairUserDtoList.get(0).getRuId());
- repairUser.setRepairEvent("auditUser");
- flag = repairUserNewV1InnerServiceSMOImpl.saveRepairUserNew(repairUser);
- if (flag < 1) {
- throw new CmdException("鏇存柊寰俊娲惧崟姹犱俊鎭け璐�");
- }
- } else { //濡傛灉鏄憳宸ヤ唬瀹㈡姤淇垨鐢佃瘽鎶ヤ慨锛岀姸鎬佸氨鍙樻垚宸叉敮浠�
- repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
- //濡傛灉鏄凡鏀粯鐘舵�侊紝灏辨洿鏂扮粨鏉熸椂闂�
- repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUserPo.setContext("宸叉敮浠�" + paramObj.getString("feePrice") + "鍏�");
- }
- flag = repairUserNewV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
- if (flag < 1) {
- throw new CmdException("鏇存柊寰俊娲惧崟姹犱俊鎭け璐�");
- }
- }
- }
-
- /**
- * 澶勭悊鍋滆溅璐�
- *
- * @param paramObj
- */
- private void updateCarEndTime(JSONObject paramObj) {
- int flag;
- 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 (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();
+ BigDecimal value = new BigDecimal(payFeeDetailPo.getGiftAmount());
+ value = value.add(new BigDecimal(specValue).multiply(new BigDecimal(feePriceMap.get("feePrice").toString())));
+ payFeeDetailPo.setGiftAmount(value.doubleValue() + "");
}
}
- // todo 瀛楁瘝杞︿綅锛屽瓙杞︿綅缂磋垂 姣嶈溅浣嶅欢鏈�
- if (sonMotherParking) {
- queryMotherOwnerCars(num, ownerCarDtos, psId);
+ for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
+ JSONObject param = selectDiscounts.getJSONObject(discountIndex);
+ addPayFeeDetailDiscount(paramObj, param, payFeeDetailPo);
}
-
-
- 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);
- }
-
/**
* 娣诲姞灏忓尯淇℃伅
@@ -677,7 +439,7 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public void addPayFeeDetailDiscount(JSONObject paramInJson, JSONObject discountJson) {
+ public void addPayFeeDetailDiscount(JSONObject paramInJson, JSONObject discountJson, PayFeeDetailPo payFeeDetailPo) {
JSONObject businessFee = new JSONObject();
businessFee.put("detailDiscountId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailDiscountId));
businessFee.put("discountPrice", discountJson.getString("discountPrice"));
@@ -691,6 +453,32 @@
if (fage < 1) {
throw new CmdException("鏇存柊璐圭敤淇℃伅澶辫触");
+ }
+
+ FeeDiscountDto feeDiscountDto = new FeeDiscountDto();
+ feeDiscountDto.setDiscountId(discountJson.getString("discountId"));
+ List<FeeDiscountDto> feeDiscountDtos = feeDiscountInnerServiceSMOImpl.queryFeeDiscounts(feeDiscountDto);
+
+ if (ListUtil.isNull(feeDiscountDtos)) {
+ return;
+ }
+
+ //todo 鎵撴姌鎴栬�呯┖缃埧鎵撴姌
+ if (FeeDiscountRuleDto.DISCOUNT_SMALL_TYPE_DISCOUNT.equals(feeDiscountDtos.get(0).getDiscountSmallType())
+ || FeeDiscountRuleDto.DISCOUNT_SMALL_TYPE_APPLY_DISCOUNT.equals(feeDiscountDtos.get(0).getDiscountSmallType())
+ ) {
+ BigDecimal value = new BigDecimal(payFeeDetailPo.getDiscountAmount());
+ value = value.add(new BigDecimal(discountJson.getString("discountPrice")));
+ payFeeDetailPo.setDiscountAmount(value.doubleValue() + "");
+ } else if (FeeDiscountRuleDto.DISCOUNT_SMALL_TYPE_DEDUCTION.equals(feeDiscountDtos.get(0).getDiscountSmallType())
+ || FeeDiscountRuleDto.DISCOUNT_SMALL_TYPE_APPLY_DEDUCTION.equals(feeDiscountDtos.get(0).getDiscountSmallType())) {
+ BigDecimal value = new BigDecimal(payFeeDetailPo.getDeductionAmount());
+ value = value.add(new BigDecimal(discountJson.getString("discountPrice")));
+ payFeeDetailPo.setDeductionAmount(value.doubleValue() + "");
+ } else if (FeeDiscountRuleDto.DISCOUNT_SMALL_TYPE_LATE.equals(feeDiscountDtos.get(0).getDiscountSmallType())) {
+ BigDecimal value = new BigDecimal(payFeeDetailPo.getLateAmount());
+ value = value.add(new BigDecimal(discountJson.getString("discountPrice")));
+ payFeeDetailPo.setLateAmount(value.doubleValue() + "");
}
}
@@ -720,19 +508,18 @@
}
feeDto = feeDtos.get(0);
businessFeeDetail.put("startTime", DateUtil.getFormatTimeStringA(feeDto.getEndTime()));
- int hours = 0;
Date targetEndTime = null;
BigDecimal cycles = null;
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
- if ("-101".equals(paramInJson.getString("cycles"))) { // 鑷畾涔夐噾棰濅氦璐�
+
+ if (PayFeeDataDto.TEMP_CYCLE_CUSTOM_AMOUNT.equals(paramInJson.getString("cycles"))) { // todo 鑷畾涔夐噾棰濅氦璐�
Date endTime = feeDto.getEndTime();
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
- endCalender = getTargetEndTime(endCalender, cycles.doubleValue());
- targetEndTime = endCalender.getTime();
+ targetEndTime = computeFeeSMOImpl.getTargetEndTime(cycles.doubleValue(), endCalender.getTime(), true);
paramInJson.put("tmpCycles", cycles.doubleValue());
businessFeeDetail.put("cycles", cycles.doubleValue());
//澶勭悊 鍙兘杩樺瓨鍦� 瀹炴敹鎵嬪伐鍑忓厤鐨勬儏鍐�
@@ -745,14 +532,13 @@
if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
}
- } else if ("-103".equals(paramInJson.getString("cycles"))) { //杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
+ } else if (PayFeeDataDto.TEMP_CYCLE_CUSTOM_END_TIME.equals(paramInJson.getString("cycles"))) { //todo 杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
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;
+ if (!custEndTime.contains(":")) {
+ custEndTime += " 23:59:59";
+ }
+ targetEndTime = DateUtil.getDateFromStringA(custEndTime);
+
BigDecimal receivedAmount1 = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
cycles = receivedAmount1.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
paramInJson.put("tmpCycles", cycles.doubleValue());
@@ -768,14 +554,12 @@
if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
}
- } else if ("-105".equals(paramInJson.getString("cycles"))) { //杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
+ } 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;
+ if (!customEndTime.contains(":")) {
+ customEndTime += " 23:59:59";
+ }
+ targetEndTime = DateUtil.getDateFromStringA(customEndTime);
BigDecimal receivedAmount1 = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
cycles = receivedAmount1.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
paramInJson.put("tmpCycles", cycles.doubleValue());
@@ -813,60 +597,15 @@
return businessFeeDetail;
}
- public JSONObject modifyFee(JSONObject paramInJson) {
+ public JSONObject modifyFee(JSONObject paramInJson, PayFeeDetailPo payFeeDetailPo) {
JSONObject businessFee = new JSONObject();
FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
- Date endTime = feeInfo.getEndTime();
- 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")));
- }
- 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());
- 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();
- }
+ String endTime = DateUtil.getNextSecTime(payFeeDetailPo.getEndTime());
+ feeInfo.setEndTime(DateUtil.getDateFromStringA(endTime));
- //濡傛灉闂存瓏鎬ц垂鐢ㄦ病鏈夎缃粨鏉熸椂闂� 鍒欏彇璐圭敤椤圭殑
+ Date maxEndTime = feeInfo.getMaxEndTime();
if (maxEndTime == null) {
maxEndTime = feeInfo.getConfigEndTime();
}
@@ -891,14 +630,16 @@
// 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
if (!FeeFlagTypeConstant.ONETIME.equals(feeInfo.getFeeFlag())) {
//杩欓噷 瀹归敊浜斿ぉ鏃堕棿
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(maxEndTime);
- calendar.add(Calendar.DAY_OF_MONTH, -5);
- maxEndTime = calendar.getTime();
+// Calendar calendar = Calendar.getInstance();
+// calendar.setTime(maxEndTime);
+// calendar.add(Calendar.DAY_OF_MONTH, -5);
+// maxEndTime = calendar.getTime();
if (feeInfo.getEndTime().after(maxEndTime)) {
businessFee.put("state", FeeDto.STATE_FINISH);
businessFee.put("endTime", maxEndTime);
}
+ } else {
+ businessFee.put("state", FeeDto.STATE_FINISH);
}
return businessFee;
}
@@ -907,7 +648,7 @@
public void dealAccount(JSONObject paramObj) {
//鍒ゆ柇閫夋嫨鐨勮处鍙�
JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
- if (jsonArray == null || jsonArray.size() < 1) {
+ if (ListUtil.isNull(jsonArray)) {
return;
}
List<AccountDto> accountDtos = new ArrayList<>();
@@ -918,13 +659,6 @@
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"));
int flag = amount.compareTo(receivedAmount);
@@ -932,69 +666,6 @@
redepositAmount = amount;//鎶垫墸閲戦
} else {
redepositAmount = 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)) {
@@ -1005,7 +676,7 @@
//鏌ヨ璐︽埛閲戦
accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
Assert.listOnlyOne(accountDtos, "鏌ヨ璐︽埛閲戦閿欒锛�");
- if (accountDtos != null && accountDtos.size() > 0) {
+ if (!ListUtil.isNull(accountDtos)) {
AccountDto accountDto1 = accountDtos.get(0);
BigDecimal accountDto1Amount = new BigDecimal(accountDto1.getAmount());
if (accountDto1Amount.compareTo(redepositAmount) == -1) {
@@ -1056,7 +727,7 @@
tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
- Assert.listOnlyOne(feeConfigDtos, "鎸夎嚜瀹氫箟鏃堕棿娈电即璐规椂锛岃垂鐢ㄥ繀椤讳负闂存帴鎬ц垂鐢紝鎴栬�呭瓨鍦ㄥ悕绉颁负 " + feeConfigDto.getFeeName() + "娆犺垂 鐨勯棿鎺ユ�ц垂鐢紝瀹冪殑鍏紡璁＄畻蹇呴』瑕佸拰" + feeConfigDto.getFeeName() + "涓�鑷�");
+// Assert.listOnlyOne(feeConfigDtos, "鎸夎嚜瀹氫箟鏃堕棿娈电即璐规椂锛岃垂鐢ㄥ繀椤讳负闂存帴鎬ц垂鐢紝鎴栬�呭瓨鍦ㄥ悕绉颁负 " + feeConfigDto.getFeeName() + "娆犺垂 鐨勯棿鎺ユ�ц垂鐢紝瀹冪殑鍏紡璁＄畻蹇呴』瑕佸拰" + feeConfigDto.getFeeName() + "涓�鑷�");
}
@@ -1098,16 +769,8 @@
tmpPayFeeDetailPo.setState(FeeDetailDto.STATE_OWE);
tmpPayFeeDetailPo.setOpenInvoice("N");
tmpPayFeeDetailPo.setRemark("鎸夌即璐规椂闂存缂磋垂,杩欓儴鍒嗚垂鐢ㄦ寜娆犺垂鐨勬柟寮忛噸鏂扮敓鎴愶紝璇峰湪" + payObjNameRemark + "涓婃煡鐪�");
- if (!StringUtil.isEmpty(reqJson.getString("cashAmount")) && !StringUtil.isEmpty(reqJson.getString("integralAmount"))) {
- BigDecimal cashAmount = new BigDecimal(reqJson.getString("cashAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
- BigDecimal integralAmount = new BigDecimal(reqJson.getString("integralAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
- if (!StringUtil.isEmpty(tmpPayFeeDetailPo.getRemark())) {
- tmpPayFeeDetailPo.setRemark(tmpPayFeeDetailPo.getRemark() + "锛岀幇閲戣处鎴锋姷鎵�" + cashAmount + "鍏冿紝绉垎璐︽埛鎶垫墸" + integralAmount + "鍏�");
- } else {
- tmpPayFeeDetailPo.setRemark("鐜伴噾璐︽埛鎶垫墸" + cashAmount + "鍏冿紝绉垎璐︽埛鎶垫墸" + integralAmount + "鍏�");
- }
- }
- if (!StringUtil.isEmpty(reqJson.getString("cashAmount")) && StringUtil.isEmpty(reqJson.getString("integralAmount"))) {
+
+ if (!StringUtil.isEmpty(reqJson.getString("cashAmount"))) {
BigDecimal cashAmount = new BigDecimal(reqJson.getString("cashAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
if (!StringUtil.isEmpty(tmpPayFeeDetailPo.getRemark())) {
tmpPayFeeDetailPo.setRemark(tmpPayFeeDetailPo.getRemark() + "锛岀幇閲戣处鎴锋姷鎵�" + cashAmount + "鍏�");
@@ -1115,16 +778,9 @@
tmpPayFeeDetailPo.setRemark("鐜伴噾璐︽埛鎶垫墸" + cashAmount + "鍏�");
}
}
- if (StringUtil.isEmpty(reqJson.getString("cashAmount")) && !StringUtil.isEmpty(reqJson.getString("integralAmount"))) {
- BigDecimal integralAmount = new BigDecimal(reqJson.getString("integralAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
- if (!StringUtil.isEmpty(tmpPayFeeDetailPo.getRemark())) {
- tmpPayFeeDetailPo.setRemark(tmpPayFeeDetailPo.getRemark() + "锛岀Н鍒嗚处鎴锋姷鎵�" + integralAmount + "鍏�");
- } else {
- tmpPayFeeDetailPo.setRemark("绉垎璐︽埛鎶垫墸" + integralAmount + "鍏�");
- }
- }
- int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(tmpPayFeeDetailPo);
+ int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(tmpPayFeeDetailPo);
+ //3
if (flag < 1) {
throw new CmdException("鐢熸垚娆犺垂澶辫触");
}
@@ -1208,21 +864,6 @@
feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
tmpPayFeePo.setConfigId(feeConfigDtos.get(0).getConfigId());
- }
-
- private static Calendar getTargetEndTime(Calendar endCalender, Double cycles) {
- if (StringUtil.isInteger(cycles.toString())) {
- endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
- return endCalender;
- }
- if (cycles >= 1) {
- endCalender.add(Calendar.MONTH, new Double(Math.floor(cycles)).intValue());
- cycles = cycles - Math.floor(cycles);
- }
- int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
- int hours = new Double(cycles * futureDay * 24).intValue();
- endCalender.add(Calendar.HOUR, hours);
- return endCalender;
}
}
--
Gitblit v1.8.0