From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 49 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
index 9f4ccc3..3c6651b 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
@@ -5,31 +5,32 @@
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.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
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.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.community.IRepairInnerServiceSMO;
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.community.*;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.utils.constant.FeeFlagTypeConstant;
-import com.java110.utils.constant.FeeStateConstant;
+import com.java110.utils.constant.FeeConfigConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.ListenerExecuteException;
@@ -38,6 +39,7 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +51,7 @@
import java.util.Map;
@Java110Cmd(serviceCode = "fee.payBatchFee")
-public class PayBatchFeeCmd extends AbstractServiceCmdListener {
+public class PayBatchFeeCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(PayBatchFeeCmd.class);
@@ -59,7 +61,7 @@
@Autowired
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
@Autowired
- private IPayFeeDetailNewV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
@Autowired
private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
@@ -91,12 +93,15 @@
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@Autowired
- private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
+ private IRepairPoolV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
@Autowired
- private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
+ private IRepairUserV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
@@ -130,39 +135,60 @@
feeConfigDto.setConfigId(feeDto.getConfigId());
feeConfigDto.setCommunityId(paramInObj.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
- if (feeConfigDtos != null && feeConfigDtos.size() == 1) {
+ if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
+ throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
+ }
+ Date maxEndTime = feeDtos.get(0).getDeadlineTime();
+ if (!FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
try {
- Date configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
- Date newDate = DateUtil.stepMonth(endTime, paramInObj.getInteger("cycles") - 1);
- if (newDate.getTime() > configEndTime.getTime()) {
- throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
- }
- } catch (Exception e) {
+ maxEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
+ } catch (ParseException e) {
logger.error("姣旇緝璐圭敤鏃ユ湡澶辫触", e);
}
+ Date newDate = DateUtil.stepMonth(endTime, paramInObj.getInteger("cycles") - 1);
+ if (newDate.getTime() > maxEndTime.getTime()) {
+ throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
+ }
}
+
}
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+
JSONArray fees = reqJson.getJSONArray("fees");
JSONObject paramInObj = null;
+ JSONArray details = new JSONArray();
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
try {
paramInObj = fees.getJSONObject(feeIndex);
- doDeal(paramInObj, reqJson.getString("communityId"), cmdDataFlowContext);
+ doDeal(paramInObj, reqJson.getString("communityId"), cmdDataFlowContext, userDtos.get(0));
} catch (Exception e) {
logger.error("澶勭悊寮傚父", e);
throw new CmdException(e.getMessage());
}
+ details.add(paramInObj.getString("detailId"));
}
+
+ JSONObject data = new JSONObject();
+ data.put("details",details);
+
+ cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(data));
}
- private void doDeal(JSONObject paramObj, String communityId, ICmdDataFlowContext cmdDataFlowContext) throws Exception {
+ private void doDeal(JSONObject paramObj, String communityId, ICmdDataFlowContext cmdDataFlowContext, UserDto userDto) throws Exception {
paramObj.put("communityId", communityId);
- //娣诲姞鍗曞厓淇℃伅
+ //鑾峰彇璁㈠崟ID
+ String oId = Java110TransactionalFactory.getOId();
+
//寮�濮嬮攣浠ｇ爜
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
@@ -171,6 +197,12 @@
DistributedLock.waitGetDistributedLock(key, requestId);
JSONObject feeDetail = addFeeDetail(paramObj);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
+ if (StringUtil.isEmpty(oId)) {
+ oId = payFeeDetailPo.getDetailId();
+ }
+ payFeeDetailPo.setPayOrderId(oId);
+ payFeeDetailPo.setCashierId(userDto.getUserId());
+ payFeeDetailPo.setCashierName(userDto.getName());
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
@@ -315,8 +347,18 @@
throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
}
}
+
+ Calendar endTimeCalendar = null;
//杞︿綅璐圭敤缁
for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+ //鍚庝粯璐� 鎴栬�呬俊鐢ㄦ湡杞﹁締 鍔犱竴涓湀
+ if (FeeConfigDto.PAYMENT_CD_AFTER.equals(feeInfo.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;
}
@@ -344,9 +386,8 @@
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
- if (!businessFeeDetail.containsKey("state") || StringUtil.isEmpty(businessFeeDetail.getString("state"))) {
- businessFeeDetail.put("state", "1400");
- }
+ businessFeeDetail.put("state", FeeDetailDto.STATE_NORMAL);
+
feeDto = feeDtos.get(0);
businessFeeDetail.put("startTime", DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
int hours = 0;
@@ -354,23 +395,13 @@
BigDecimal cycles = null;
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
- if ("-101".equals(paramInJson.getString("cycles"))) {
- 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();
- paramInJson.put("tmpCycles", cycles.doubleValue());
- businessFeeDetail.put("cycles", cycles.doubleValue());
- businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
- } 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);
- }
+
+ 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);
+ businessFeeDetail.put("payableAmount", tmpReceivableAmount);
+
businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(targetEndTime, DateUtil.DATE_FORMATE_STRING_A));
paramInJson.put("feeInfo", feeDto);
paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
@@ -404,9 +435,15 @@
feeInfo.setState(FeeDto.STATE_FINISH);
}
feeInfo.setEndTime(endCalender.getTime());
+ Date maxEndTime = feeInfo.getDeadlineTime();
+ if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
+ 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));
@@ -422,16 +459,15 @@
// 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
- 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", FeeConfigConstant.END);
+ businessFee.put("endTime", maxEndTime);
}
}
--
Gitblit v1.8.0