From 9fea88487897fd62842906e7ef293500d54182cf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 九月 2020 00:46:31 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 81f38bd..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,8 @@
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;
import com.java110.dto.fee.FeeDto;
@@ -92,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);
@@ -110,6 +112,9 @@
addFeeDetail(feeObj);
modifyFee(feeObj);
+
+ //灏嗘湁璐﹀崟涓嬬殑 鐘舵�佹敼涓哄凡缁忕即璐�
+ modifyFeeBill(feeObj);
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -139,6 +144,31 @@
/**
* @param feeObj
*/
+ private void modifyFeeBill(JSONObject feeObj) {
+
+ 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);
+ billOweFeeDto.setBillId(billDtos.get(0).getBillId());
+ feeInnerServiceSMOImpl.updateBillOweFees(billOweFeeDto);
+
+ }
+
+ /**
+ * @param feeObj
+ */
private void modifyFee(JSONObject feeObj) throws ParseException {
PayFeePo payFeePo = new PayFeePo();
@@ -156,7 +186,9 @@
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());
@@ -169,8 +201,9 @@
}
}
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);
if (saveFlag < 1) {
throw new IllegalArgumentException("缂磋垂澶辫触" + payFeePo.toString());
--
Gitblit v1.8.0