From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 10 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
index 859d6d3..8ae16c8 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
@@ -9,18 +9,24 @@
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.app.AppDto;
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.feeReceipt.FeeReceiptDetailDto;
+import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.intf.community.*;
import com.java110.intf.fee.*;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.feeReceipt.FeeReceiptPo;
@@ -87,6 +93,12 @@
private IRepairUserV1InnerServiceSMO repairUserV1InnerServiceSMOImpl;
@Autowired
+ private IOwnerCarNewV1InnerServiceSMO ownerCarNewV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ @Autowired
private IComputeFeeSMO computeFeeSMOImpl;
@@ -123,6 +135,9 @@
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
feeObj = fees.getJSONObject(feeIndex);
feeObj.put("communityId", paramObj.getString("communityId"));
+ if (paramObj.containsKey("oId")) {
+ feeObj.put("oId", paramObj.getString("oId"));
+ }
String remark = paramObj.getString("remark");
feeObj.put("remark", remark);
if (!feeObj.containsKey("primeRate") && AppDto.OWNER_WECHAT_PAY.equals(appId)) { //寰俊鍏紬鍙锋敮浠�
@@ -159,7 +174,9 @@
dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos));
}
- private void getFeeReceiptDetailPo(ICmdDataFlowContext dataFlowContext, JSONObject paramObj, List<FeeReceiptDetailPo> feeReceiptDetailPos, List<FeeReceiptPo> feeReceiptPos) {
+ private void getFeeReceiptDetailPo(ICmdDataFlowContext dataFlowContext, JSONObject paramObj,
+ List<FeeReceiptDetailPo> feeReceiptDetailPos,
+ List<FeeReceiptPo> feeReceiptPos) {
int flag = 0;
if (!paramObj.containsKey("primeRate")) {
paramObj.put("primeRate", "6");
@@ -177,6 +194,9 @@
addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos);
modifyOweFee(paramObj, dataFlowContext);
+ //淇敼杞﹁締
+ updateCarEndTime(paramObj);
+
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
feeAttrDto.setCommunityId(paramObj.getString("communityId"));
@@ -192,7 +212,7 @@
repairPoolPo.setCommunityId(paramObj.getString("communityId"));
repairPoolPo.setState(RepairDto.STATE_APPRAISE);
flag = repairPoolV1InnerServiceSMOImpl.updateRepairPoolNew(repairPoolPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇敼澶辫触");
}
}
@@ -235,7 +255,7 @@
repairUser.setPreRuId(repairUserDtoList.get(0).getRuId());
repairUser.setRepairEvent("auditUser");
flag = repairUserV1InnerServiceSMOImpl.saveRepairUserNew(repairUserPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇敼澶辫触");
}
} else { //濡傛灉鏄憳宸ヤ唬瀹㈡姤淇垨鐢佃瘽鎶ヤ慨锛岀姸鎬佸氨鍙樻垚宸叉敮浠�
@@ -244,7 +264,7 @@
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
repairUserPo.setContext("宸叉敮浠�" + paramObj.getString("receivedAmount") + "鍏�");
flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇敼澶辫触");
}
}
@@ -276,7 +296,7 @@
if (!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
maxEndTime = feeInfo.getDeadlineTime();
}
- if(maxEndTime != null) { //杩欓噷鏁版嵁闂鐨勬儏鍐典笅
+ if (maxEndTime != null) { //杩欓噷鏁版嵁闂鐨勬儏鍐典笅
Date endTime = DateUtil.getDateFromStringA(paramInJson.getString("endTime"));
if (endTime.getTime() >= maxEndTime.getTime()) {
feeMap.put("state", FeeDto.STATE_FINISH);
@@ -284,7 +304,7 @@
}
businessFee.putAll(feeMap);
- PayFeePo payFeePo = BeanConvertUtil.covertBean(businessFee,PayFeePo.class);
+ PayFeePo payFeePo = BeanConvertUtil.covertBean(businessFee, PayFeePo.class);
int flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("淇敼澶辫触");
@@ -292,8 +312,8 @@
}
public void addOweFeeDetail(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext,
- List<FeeReceiptDetailPo> feeReceiptDetailPos,
- List<FeeReceiptPo> feeReceiptPos) {
+ List<FeeReceiptDetailPo> feeReceiptDetailPos,
+ List<FeeReceiptPo> feeReceiptPos) {
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
@@ -320,13 +340,30 @@
endCalender.setTime(endTime);
BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
- businessFeeDetail.put("cycles", cycles.doubleValue());
- businessFeeDetail.put("receivableAmount", paramInJson.getString("receivedAmount"));
+ businessFeeDetail.put("cycles", receivedAmount.divide(feePrice, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+
+ if (!paramInJson.containsKey("receivableAmount") || StringUtil.isEmpty(paramInJson.getString("receivableAmount"))) {
+ paramInJson.put("receivableAmount", paramInJson.getString("receivedAmount"));
+ }
+
+ businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
businessFeeDetail.put("receivedAmount", paramInJson.getString("receivedAmount"));
+ businessFeeDetail.put("payableAmount", paramInJson.getString("receivedAmount"));
businessFeeDetail.put("endTime", paramInJson.getString("endTime"));
paramInJson.put("feeInfo", feeDto);
paramInJson.put("cycles", cycles.doubleValue());
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
+ if (paramInJson.containsKey("oId")) {
+ payFeeDetailPo.setPayOrderId(paramInJson.getString("oId"));
+ } else {
+ String oId = Java110TransactionalFactory.getOId();
+ if(StringUtil.isEmpty(oId)){
+ oId = payFeeDetailPo.getDetailId();
+ }
+ payFeeDetailPo.setPayOrderId(oId);
+
+ }
+
int flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
@@ -362,4 +399,68 @@
feeReceiptPos.add(feeReceiptPo);
}
+ 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 杞︿綅閲婃斁)
+ 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("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
+ }
+ }
+
+
+ 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("缂磋垂澶辫触");
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0