From 09095d67f2e2acf45dcd55155da491e44206db4e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 05 四月 2024 15:38:14 +0800
Subject: [PATCH] 修改时间 将时间修改 未23:59:59秒
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java | 264 ++++++++++++++++++++++++----------------------------
1 files changed, 124 insertions(+), 140 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
index cc8bc70..6bb345e 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
@@ -2,32 +2,27 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+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;
import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.IComputeFeeSMO;
-import com.java110.dto.FloorDto;
-import com.java110.dto.RoomDto;
-import com.java110.dto.UnitDto;
+import com.java110.core.smo.IOwnerGetDataCheck;
+import com.java110.dto.floor.FloorDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.unit.UnitDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.community.IUnitInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import com.java110.vo.api.fee.ApiFeeDataVo;
import com.java110.vo.api.fee.ApiFeeVo;
import org.slf4j.Logger;
@@ -36,31 +31,21 @@
import org.springframework.http.ResponseEntity;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+/**
+ * 鏌ヨ 璐圭敤淇℃伅
+ */
@Java110Cmd(serviceCode = "fee.listFee")
public class ListFeeCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListFeeCmd.class);
@Autowired
- private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
-
- @Autowired
- private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
- @Autowired
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
- @Autowired
- private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
@@ -73,6 +58,12 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerGetDataCheck ownerGetDataCheckImpl;
//鍩�
public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
@@ -90,57 +81,59 @@
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
+
+ // todo 涓氫富鏌ヨ鍚堟硶鎬ф牎楠�
+ ownerGetDataCheckImpl.checkOwnerFee(CmdContextUtils.getAppId(cmdDataFlowContext), CmdContextUtils.getLoginUserId(cmdDataFlowContext), reqJson);
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
- String[] roomNums = reqJson.getString("roomNum").split("-",3);
+ String[] roomNums = reqJson.getString("roomNum").split("-");
if (roomNums == null || roomNums.length != 3) {
- throw new IllegalArgumentException("鎴垮眿缂栧彿鏍煎紡閿欒锛�");
+ throw new IllegalArgumentException("鎴垮眿缂栧彿鏍煎紡涓嶅锛�");
}
- String floorNum = roomNums[0];
- String unitNum = roomNums[1];
- String roomNum = roomNums[2];
- FloorDto floorDto = new FloorDto();
- floorDto.setFloorNum(floorNum);
- floorDto.setCommunityId(reqJson.getString("communityId"));
- List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
- if (floorDtos != null && floorDtos.size() > 0) {
- for (FloorDto floor : floorDtos) {
- UnitDto unitDto = new UnitDto();
- unitDto.setFloorId(floor.getFloorId());
- unitDto.setUnitNum(unitNum);
- List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
- if (unitDtos != null && unitDtos.size() > 0) {
- for (UnitDto unit : unitDtos) {
- RoomDto roomDto = new RoomDto();
- roomDto.setUnitId(unit.getUnitId());
- roomDto.setRoomNum(roomNum);
- roomDto.setCommunityId(reqJson.getString("communityId"));
- List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos, "鏌ヨ鎴垮眿閿欒锛�");
- reqJson.put("payerObjId", roomDtos.get(0).getRoomId());
- }
- }
- }
- }
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(reqJson.getString("communityId"));
+ roomDto.setFloorNum(roomNums[0]);
+ roomDto.setUnitNum(roomNums[1]);
+ roomDto.setRoomNum(roomNums[2]);
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ Assert.listOnlyOne(roomDtos, "鎵句笉鍒版埧灞嬩俊鎭紒");
}
+ // todo 鎴垮眿鍚嶇О 鍒峰叆 鎴垮眿ID
+ freshPayerObjIdByRoomNum(reqJson);
FeeDto feeDto = BeanConvertUtil.covertBean(reqJson, FeeDto.class);
- int count = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
+ // todo 澶勭悊 澶氫釜鎴垮眿
+ morePayerObjIds(reqJson, feeDto);
List<ApiFeeDataVo> fees = new ArrayList<>();
-
+ if (reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))) {
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(reqJson.getString("payerObjId"));
+ ownerRoomRelDto.setOwnerId(reqJson.getString("ownerId"));
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ ApiFeeVo apiFeeVo = new ApiFeeVo();
+ apiFeeVo.setTotal(0);
+ apiFeeVo.setRecords((int) Math.ceil((double) 0 / (double) reqJson.getInteger("row")));
+ apiFeeVo.setFees(fees);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeVo), HttpStatus.OK);
+ cmdDataFlowContext.setResponseEntity(responseEntity);
+ }
+ }
+ int count = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
if (count > 0) {
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);//鏌ヨ璐圭敤椤圭洰
- computeFeePrice(feeDtos);//璁＄畻璐圭敤
+ //todo 璁＄畻璐圭敤
+ computeFeePrice(feeDtos);
List<ApiFeeDataVo> apiFeeDataVos = BeanConvertUtil.covertBeanList(feeDtos, ApiFeeDataVo.class);
for (ApiFeeDataVo apiFeeDataVo : apiFeeDataVos) {
//鑾峰彇浠樿垂瀵硅薄绫诲瀷
String payerObjType = apiFeeDataVo.getPayerObjType();
- if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("6666")) {
+ if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(payerObjType)) {
apiFeeDataVo.setCarTypeCd("1001");
}
fees.add(apiFeeDataVo);
@@ -157,6 +150,63 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+ /**
+ * 澶勭悊 澶氬璞� 璐圭敤
+ *
+ * @param reqJson
+ * @param feeDto
+ */
+ private void morePayerObjIds(JSONObject reqJson, FeeDto feeDto) {
+ if (!reqJson.containsKey("payerObjIds") || StringUtil.isEmpty(reqJson.getString("payerObjIds"))) {
+ return;
+ }
+ String payerObjIds = reqJson.getString("payerObjIds");
+ feeDto.setPayerObjIds(payerObjIds.split(","));
+ }
+
+ /**
+ * 鏍规嵁鎴垮眿鍚嶇О 鍒峰叆 payerObjId
+ *
+ * @param reqJson
+ */
+ private void freshPayerObjIdByRoomNum(JSONObject reqJson) {
+ if (!reqJson.containsKey("roomNum") || StringUtil.isEmpty(reqJson.getString("roomNum"))) {
+ return;
+ }
+ String[] roomNums = reqJson.getString("roomNum").split("-", 3);
+ if (roomNums == null || roomNums.length != 3) {
+ throw new IllegalArgumentException("鎴垮眿缂栧彿鏍煎紡閿欒锛�");
+ }
+ String floorNum = roomNums[0];
+ String unitNum = roomNums[1];
+ String roomNum = roomNums[2];
+ FloorDto floorDto = new FloorDto();
+ floorDto.setFloorNum(floorNum);
+ floorDto.setCommunityId(reqJson.getString("communityId"));
+ List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
+ if (ListUtil.isNull(floorDtos)) {
+ return;
+ }
+ for (FloorDto floor : floorDtos) {
+ UnitDto unitDto = new UnitDto();
+ unitDto.setFloorId(floor.getFloorId());
+ unitDto.setUnitNum(unitNum);
+ List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
+ if (unitDtos == null || unitDtos.size() < 1) {
+ continue;
+ }
+ for (UnitDto unit : unitDtos) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setUnitId(unit.getUnitId());
+ roomDto.setRoomNum(roomNum);
+ roomDto.setCommunityId(reqJson.getString("communityId"));
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ Assert.listOnlyOne(roomDtos, "鏌ヨ涓嶅埌鎴垮眿锛�");
+ reqJson.put("payerObjId", roomDtos.get(0).getRoomId());
+ }
+ }
+ }
+
private void freshFeeAttrs(List<ApiFeeDataVo> fees, List<FeeDto> feeDtos) {
for (ApiFeeDataVo apiFeeDataVo : fees) {
for (FeeDto feeDto : feeDtos) {
@@ -168,27 +218,23 @@
}
private void computeFeePrice(List<FeeDto> feeDtos) {
-
- if (feeDtos == null || feeDtos.size() < 1) {
+ if (ListUtil.isNull(feeDtos)) {
return;
}
String val = CommunitySettingFactory.getValue(feeDtos.get(0).getCommunityId(), TOTAL_FEE_PRICE);
if (StringUtil.isEmpty(val)) {
val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
}
-
//鍏堝彇鍗曞皬鍖虹殑濡傛灉娌℃湁閰嶇疆 鍙� 鍏ㄥ眬鐨�
String received_amount_switch = CommunitySettingFactory.getValue(feeDtos.get(0).getCommunityId(), RECEIVED_AMOUNT_SWITCH);
if (StringUtil.isEmpty(received_amount_switch)) {
received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
}
-
//鍏堝彇鍗曞皬鍖虹殑濡傛灉娌℃湁閰嶇疆 鍙� 鍏ㄥ眬鐨�
String offlinePayFeeSwitch = CommunitySettingFactory.getValue(feeDtos.get(0).getCommunityId(), OFFLINE_PAY_FEE_SWITCH);
if (StringUtil.isEmpty(offlinePayFeeSwitch)) {
offlinePayFeeSwitch = MappingCache.getValue(DOMAIN_COMMON, OFFLINE_PAY_FEE_SWITCH);
}
-
for (FeeDto feeDto : feeDtos) {
try {
// 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
@@ -196,14 +242,13 @@
Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
feeDto.setCycle(feeDto.getPaymentCycle());
- feeDto.setDeadlineTime(targetEndDate);
- if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
- computeFeePriceByRoom(feeDto, oweMonth);
- } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
- computeFeePriceByCar(feeDto, oweMonth);
- } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
- computeFeePriceByContract(feeDto, oweMonth);
+ //todo 杩欓噷鑰冭檻 璐﹀崟妯″紡鐨勫満鏅�
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
+ feeDto.setCycle(oweMonth + "");
}
+ feeDto.setDeadlineTime(targetEndDate);
+ //todo 绠楄垂
+ doComputeFeePrice(feeDto, oweMonth);
feeDto.setVal(val);
//鍏抽棴 绾夸笅鏀堕摱鍔熻兘
@@ -213,48 +258,13 @@
feeDto.setReceivedAmountSwitch(received_amount_switch);
}
feeDto.setOfflinePayFeeSwitch(offlinePayFeeSwitch);
-
} catch (Exception e) {
logger.error("鏌ヨ璐圭敤淇℃伅 锛岃垂鐢ㄤ俊鎭敊璇�", e);
}
+ //鍘绘帀澶氫綑0
+ feeDto.setSquarePrice(Double.parseDouble(feeDto.getSquarePrice()) + "");
+ feeDto.setAdditionalAmount(Double.parseDouble(feeDto.getAdditionalAmount()) + "");
}
- }
-
- private void computeFeePriceByCar(FeeDto feeDto, double oweMonth) {
- OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
- ownerCarDto.setCommunityId(feeDto.getCommunityId());
- ownerCarDto.setCarId(feeDto.getPayerObjId());
- List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- if (ownerCarDtos == null || ownerCarDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
- return;
- }
- ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
- parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
- List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
- return;
- }
- String computingFormula = feeDto.getComputingFormula();
- DecimalFormat df = new DecimalFormat("0.00");
- Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
- feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
- feeDto.setFeeTotalPrice(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));
-
- BigDecimal curFeePrice = new BigDecimal(feeDto.getFeePrice());
- curFeePrice = curFeePrice.multiply(new BigDecimal(oweMonth));
- feeDto.setAmountOwed(df.format(curFeePrice));
- //鍔ㄦ�佽垂鐢�
- if ("4004".equals(computingFormula)
- && FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
- && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
- feeDto.setAmountOwed(df.format(curFeePrice));
- feeDto.setDeadlineTime(DateUtil.getCurrentDate());
- }
-
- //鑰冭檻绉熼噾閫掑
- computeFeeSMOImpl.dealRentRate(feeDto);
}
/**
@@ -262,48 +272,22 @@
*
* @param feeDto
*/
- private void computeFeePriceByRoom(FeeDto feeDto, double oweMonth) {
+ private void doComputeFeePrice(FeeDto feeDto, double oweMonth) {
String computingFormula = feeDto.getComputingFormula();
- DecimalFormat df = new DecimalFormat("0.00");
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
- feeDto.setFeeTotalPrice(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));
+ //BigDecimal feeTotalPrice = new BigDecimal(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));
+ feeDto.setFeeTotalPrice(MoneyUtil.computePriceScale(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()),
+ feeDto.getScale(),
+ Integer.parseInt(feeDto.getDecimalPlace())));
BigDecimal curFeePrice = new BigDecimal(feeDto.getFeePrice());
curFeePrice = curFeePrice.multiply(new BigDecimal(oweMonth));
- feeDto.setAmountOwed((df.format(curFeePrice)));
+ feeDto.setAmountOwed(MoneyUtil.computePriceScale(curFeePrice.doubleValue(), feeDto.getScale(), Integer.parseInt(feeDto.getDecimalPlace())) + "");
//鍔ㄦ�佽垂鐢�
if ("4004".equals(computingFormula)
&& FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
&& !FeeDto.STATE_FINISH.equals(feeDto.getState())
&& feeDto.getDeadlineTime() == null) {
- feeDto.setDeadlineTime(DateUtil.getCurrentDate());
- }
-
- //鑰冭檻绉熼噾閫掑
- computeFeeSMOImpl.dealRentRate(feeDto);
-
- }
-
-
- /**
- * 鏍规嵁鍚堝悓鏉ョ畻鍗曚环
- *
- * @param feeDto
- */
- private void computeFeePriceByContract(FeeDto feeDto, double oweMonth) {
- String computingFormula = feeDto.getComputingFormula();
- DecimalFormat df = new DecimalFormat("0.00");
- Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
- feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
- feeDto.setFeeTotalPrice(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));
- BigDecimal curFeePrice = new BigDecimal(feeDto.getFeePrice());
- curFeePrice = curFeePrice.multiply(new BigDecimal(oweMonth));
- feeDto.setAmountOwed(df.format(curFeePrice));
- //鍔ㄦ�佽垂鐢�
- if ("4004".equals(computingFormula)
- && FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
- && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
- feeDto.setAmountOwed(df.format(curFeePrice) + "");
feeDto.setDeadlineTime(DateUtil.getCurrentDate());
}
//鑰冭檻绉熼噾閫掑
--
Gitblit v1.8.0