From 2bac44b5f569357beec90e6ce60940802432c5e6 Mon Sep 17 00:00:00 2001
From: jinhai <9314122@qq.com>
Date: 星期日, 13 九月 2020 17:34:29 +0800
Subject: [PATCH] 新增预存费用功能
---
service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java
index e158ed8..04a5f63 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java
@@ -5,6 +5,7 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
+import com.java110.dto.fee.BillDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
@@ -93,7 +94,7 @@
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
feeObj = fees.getJSONObject(feeIndex);
Assert.hasKeyAndValue(feeObj, "feeId", "鏈寘鍚垂鐢ㄩ」ID");
- Assert.hasKeyAndValue(feeObj, "feeId", "鏈寘鍚垂鐢ㄩ」ID");
+ Assert.hasKeyAndValue(feeObj, "feePrice", "鏈寘鍚即璐归噾棰�");
feeObj.put("communityId", communityId);
doPayOweFee(feeObj);
@@ -148,16 +149,21 @@
if (FeeConfigDto.BILL_TYPE_EVERY.equals(feeObj.getString("billType"))) {
return;
}
-
+ BillDto billDto = new BillDto();
+ billDto.setCommunityId(feeObj.getString("communityId"));
+ billDto.setConfigId(feeObj.getString("configId"));
+ billDto.setCurBill("T");
+ List<BillDto> billDtos = feeInnerServiceSMOImpl.queryBills(billDto);
+ if (billDtos == null || billDtos.size() < 1) {
+ return;
+ }
BillOweFeeDto billOweFeeDto = new BillOweFeeDto();
billOweFeeDto.setCommunityId(feeObj.getString("communityId"));
billOweFeeDto.setFeeId(feeObj.getString("feeId"));
billOweFeeDto.setState(BillOweFeeDto.STATE_FINISH_FEE);
- int updateFlag = feeInnerServiceSMOImpl.updateBillOweFees(billOweFeeDto);
+ billOweFeeDto.setBillId(billDtos.get(0).getBillId());
+ feeInnerServiceSMOImpl.updateBillOweFees(billOweFeeDto);
- if (updateFlag < 1) {
- throw new IllegalArgumentException("淇敼璐﹀崟澶辫触");
- }
}
/**
@@ -181,7 +187,8 @@
Assert.listOnlyOne(feeConfigDtos, "鏈壘鍒拌垂鐢ㄩ厤缃�");
payFeePo.setEndTime(DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
feeObj.put("billType", feeConfigDtos.get(0).getBillType());
- // 涓�娆℃�ф敹璐圭被鍨嬶紝缂磋垂鍚庯紝鍒欒缃垂鐢ㄧ姸鎬佷负鏀惰垂缁撴潫銆佽缃粨鏉熸棩鏈熶负璐圭敤椤圭粓姝㈡棩鏈�
+ feeObj.put("configId", feeConfigDtos.get(0).getConfigId());
+ // 涓�娆℃�ф敹璐圭被鍨嬶紝缂磋垂鍚庯紝鍒欒缃垂鐢ㄧ姸鎬佷负鏀惰垂缁撴潫銆佽缃粨鏉熸棩鏈熶负璐圭敤 椤圭粓姝㈡棩鏈�
if (FeeFlagTypeConstant.ONETIME.equals(feeConfigDtos.get(0).getFeeFlag())) {
payFeePo.setState(FeeStateConstant.END);
payFeePo.setEndTime(feeConfigDtos.get(0).getEndTime());
@@ -194,7 +201,7 @@
}
}
payFeePo.setFeeId(feeObj.getString("feeId"));
- payFeePo.setEndTime(DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ //payFeePo.setEndTime(DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
payFeePo.setCommunityId(feeObj.getString("communityId"));
payFeePo.setStatusCd("0");
int saveFlag = feeInnerServiceSMOImpl.updateFee(payFeePo);
--
Gitblit v1.8.0