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/bmo/fee/impl/FeeBMOImpl.java | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
index d49cc3b..8fadf6c 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
@@ -19,7 +19,7 @@
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeDetailNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.FeeAttrPo;
@@ -28,9 +28,7 @@
import com.java110.po.fee.PayFeePo;
import com.java110.po.feeReceipt.FeeReceiptPo;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -40,7 +38,6 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -77,7 +74,7 @@
private IComputeFeeSMO computeFeeSMOImpl;
@Autowired
- private IPayFeeDetailNewV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
@Autowired
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
@@ -346,14 +343,15 @@
if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) { //缂磋垂缁撴潫
feeMap.put("state", FeeDto.STATE_FINISH);
}
- try {
- Date endTime = DateUtil.getDateFromString(paramInJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_A);
- Date configEndTime = feeInfo.getConfigEndTime();
- if (endTime.getTime() >= configEndTime.getTime()) {
+ Date maxEndTime = feeInfo.getConfigEndTime();
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
+ maxEndTime = feeInfo.getDeadlineTime();
+ }
+ if (maxEndTime != null) { //杩欓噷鏁版嵁闂鐨勬儏鍐典笅
+ Date endTime = DateUtil.getDateFromStringA(paramInJson.getString("endTime"));
+ if (endTime.getTime() >= maxEndTime.getTime()) {
feeMap.put("state", FeeDto.STATE_FINISH);
}
- } catch (ParseException e) {
- throw new IllegalArgumentException("缂磋垂寮傚父" + e);
}
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
@@ -412,14 +410,18 @@
businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
businessFeeDetail.put("receivedAmount", paramInJson.getString("receivedAmount"));
+ businessFeeDetail.put("payableAmount", paramInJson.getString("receivableAmount"));
PayFeeDetailPo payFeeDetail = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
payFeeDetail.setbId("-1");
+ if (StringUtil.isEmpty(payFeeDetail.getPayableAmount())) {
+ payFeeDetail.setPayableAmount("0.0");
+ }
+ payFeeDetail.setPayOrderId(paramInJson.getString("oId"));
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetail);
if (flag < 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "淇濆瓨璐圭敤鏄庣粏澶辫触");
}
-
return businessFeeDetail;
}
@@ -438,7 +440,22 @@
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) {
+ if (feeInfo.getDeadlineTime() != null) {
+ endCalender.setTime(feeInfo.getDeadlineTime());
+ } else if (!StringUtil.isEmpty(feeInfo.getCurDegrees())) {
+ endCalender.setTime(feeInfo.getCurReadingTime());
+ } else if (feeInfo.getImportFeeEndTime() == null) {
+ endCalender.setTime(feeInfo.getConfigEndTime());
+ } else {
+ endCalender.setTime(feeInfo.getImportFeeEndTime());
+ }
+ //businessFee.put("state",FeeDto.STATE_FINISH);
+ feeInfo.setState(FeeDto.STATE_FINISH);
+ }
feeInfo.setEndTime(endCalender.getTime());
+
+
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�" + JSONObject.toJSONString(feeInfo) + "|||" + paramInJson.getString("cycles"));
@@ -448,6 +465,41 @@
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
businessFee.putAll(feeMap);
// business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
+
+ Date maxEndTime = feeInfo.getDeadlineTime();
+ if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
+ maxEndTime = feeInfo.getConfigEndTime();
+ }
+
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeInfo.getFeeFlag())) {
+ maxEndTime = feeInfo.getMaxEndTime();
+ }
+
+ //濡傛灉闂存瓏鎬ц垂鐢ㄦ病鏈夎缃粨鏉熸椂闂� 鍒欏彇璐圭敤椤圭殑
+ if (maxEndTime == null) {
+ maxEndTime = feeInfo.getConfigEndTime();
+ }
+
+ //鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
+ if (maxEndTime != null) {
+ if (feeInfo.getEndTime().getTime() - maxEndTime.getTime() > 30 * 24 * 60 * 60 * 1000L) {
+ throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
+ }
+ }
+
+ // 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
+ if (!FeeFlagTypeConstant.ONETIME.equals(feeInfo.getFeeFlag())) {
+ //杩欓噷 瀹归敊浜斿ぉ鏃堕棿
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(maxEndTime);
+ calendar.add(Calendar.DAY_OF_MONTH, -5);
+ maxEndTime = calendar.getTime();
+ if (feeInfo.getEndTime().after(maxEndTime)) {
+ businessFee.put("state", FeeDto.STATE_FINISH);
+ businessFee.put("endTime", maxEndTime);
+ }
+ }
+
PayFeePo payFee = BeanConvertUtil.covertBean(businessFee, PayFeePo.class);
int flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFee);
if (flag < 1) {
@@ -457,6 +509,8 @@
paramInJson.put("carFeeEndTime", feeInfo.getEndTime());
paramInJson.put("carPayerObjType", feeInfo.getPayerObjType());
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
+
+
return paramInJson;
}
@@ -715,6 +769,9 @@
businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
businessUnit.put("amount", "-1.00");
+ if (paramInJson.containsKey("amount") && !StringUtil.isEmpty(paramInJson.getString("amount"))) {
+ businessUnit.put("amount", paramInJson.getString("amount"));
+ }
businessUnit.put("startTime", time);
businessUnit.put("endTime", time);
businessUnit.put("communityId", paramInJson.getString("communityId"));
--
Gitblit v1.8.0