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/PayFeeConfirmCmd.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
index 3e6753f..0a08c44 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
@@ -12,6 +12,7 @@
import com.java110.dto.app.AppDto;
import com.java110.dto.couponUser.CouponUserDto;
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.feeDiscount.ComputeDiscountDto;
@@ -23,10 +24,7 @@
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
-import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
-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.user.IOwnerCarInnerServiceSMO;
import com.java110.po.accountDetail.AccountDetailPo;
@@ -34,6 +32,7 @@
import com.java110.po.car.OwnerCarPo;
import com.java110.po.couponUser.CouponUserPo;
import com.java110.po.couponUserDetail.CouponUserDetailPo;
+import com.java110.po.feeAccountDetail.FeeAccountDetailPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
@@ -49,6 +48,7 @@
import java.math.BigDecimal;
import java.text.DecimalFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -94,7 +94,7 @@
@Autowired
private IRepairPoolV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
@Autowired
- private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
+ private IRepairUserV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
@Autowired
private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
@Autowired
@@ -103,6 +103,9 @@
private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
@Autowired
private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
//榛樿搴忓垪
protected static final int DEFAULT_SEQ = 1;
@@ -130,11 +133,11 @@
paramObj.put("primeRate", "6");
paramObj.put("remark", "绾夸笂灏忕▼搴忔敮浠�");
}
+ paramObj.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
//澶勭悊鐜伴噾璐︽埛
dealAccount(paramObj);
- paramObj.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
//澶勭悊 浼樻儬鎶樻墸
addDiscount(paramObj);
@@ -288,6 +291,18 @@
throw new CmdException("璐︽埛閲戦涓嶈冻");
}
+ // 鐜伴噾璐︽埛鎵ｆ璁板綍锛岀敓鎴愭姷鎵ｆ槑缁嗚褰�
+ FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
+ feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
+ feeAccountDetailPo.setDetailId(paramObj.getString("detailId"));
+ feeAccountDetailPo.setCommunityId(paramObj.getString("communityId"));
+ feeAccountDetailPo.setState("1002"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
+ feeAccountDetailPo.setAmount(paramObj.getDouble("deductionAmount") + ""); //鐜伴噾鎶垫墸閲戦
+ feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
+// BigDecimal receivedAmountDec = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+// receivedAmountDec = receivedAmountDec.subtract(cashSum);
+// payFeeDetailPo.setReceivedAmount(receivedAmountDec.doubleValue() + "");
+
paramObj.put("remark", paramObj.getString("remark") + "-鐜伴噾璐︽埛鎶垫墸" + paramObj.getDouble("deductionAmount") + "鍏�");
}
@@ -366,26 +381,46 @@
}
private void dealOwnerCartEndTime(JSONObject paramObj) {
+
+ 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 (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"));
- List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- //杞︿綅璐圭敤缁
- if (ownerCarDtos != null) {
- for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
- if (tmpOwnerCarDto.getEndTime().getTime() < feeEndTime.getTime()) {
- OwnerCarPo ownerCarPo = new OwnerCarPo();
- ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
- ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
- int fage = ownerCarNewV1InnerServiceSMOImpl.updateOwnerCarNew(ownerCarPo);
- if (fage < 1) {
- throw new CmdException("鏇存柊璐圭敤淇℃伅澶辫触");
- }
- }
+ 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());
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+
+ Calendar endTimeCalendar = null;
+ //杞︿綅璐圭敤缁
+ if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+ return;
+ }
+ 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()) {
+ OwnerCarPo ownerCarPo = new OwnerCarPo();
+ ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
+ ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
+ int fage = ownerCarNewV1InnerServiceSMOImpl.updateOwnerCarNew(ownerCarPo);
+ if (fage < 1) {
+ throw new CmdException("鏇存柊璐圭敤淇℃伅澶辫触");
}
}
}
--
Gitblit v1.8.0