From d6b30c6097618391359565de48519614363e8a26 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 05 四月 2024 22:23:13 +0800
Subject: [PATCH] 优化时间不对bug
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 96 +++++++------------------------
service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java | 11 ++-
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 36 ++++++++----
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 17 ++---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java | 4
5 files changed, 62 insertions(+), 102 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
index 5161aec..d4b5315 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -762,16 +762,15 @@
} else {
endCalender.setTime(feeDto.getImportFeeEndTime());
}
- } else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {
- if (feeDto.getDeadlineTime() == null) {
- throw new IllegalArgumentException("闂存帴鎬ц垂鐢ㄦ湭璁剧疆缁撴潫鏃堕棿");
- }
- if ((endCalender.getTime()).after(feeDto.getDeadlineTime())) {
- endCalender.setTime(feeDto.getDeadlineTime());
- }
} else {
- if ((endCalender.getTime()).after(feeDto.getConfigEndTime())) {
- endCalender.setTime(feeDto.getConfigEndTime());
+ Date deadLineTime = feeDto.getDeadlineTime();
+ if (deadLineTime == null) {
+ deadLineTime = feeDto.getConfigEndTime();
+ }
+ if ((endCalender.getTime()).after(deadLineTime)) {
+ endCalender.setTime(feeDto.getDeadlineTime());
+ } else {
+ endCalender.add(Calendar.SECOND, -1);
}
}
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 17b13e5..1a5c6cb 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -412,10 +412,10 @@
public static Date getNextMonthFirstDate(Date curDate) {
- return getNextMonthFirstDate(curDate,1);
+ return getNextMonthFirstDate(curDate, 1);
}
- public static Date getNextMonthFirstDate(Date curDate,int monthCount) {
+ public static Date getNextMonthFirstDate(Date curDate, int monthCount) {
Calendar curDateCal = Calendar.getInstance();
curDateCal.setTime(curDate);
@@ -824,7 +824,7 @@
endCalender.setTime(endDate);
if (
startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)
- && startCalendar.get(Calendar.HOUR_OF_DAY) == endCalender.get(Calendar.HOUR_OF_DAY)
+ && startCalendar.get(Calendar.HOUR_OF_DAY) == endCalender.get(Calendar.HOUR_OF_DAY)
) {
return true;
}
@@ -832,8 +832,8 @@
return false;
}
- public static double dayCompare(Date fromDate, Date toDate){
- return dayCompare(fromDate,toDate,false);
+ public static double dayCompare(Date fromDate, Date toDate) {
+ return dayCompare(fromDate, toDate, false);
}
/**
@@ -845,12 +845,12 @@
* @param toDate
* @return
*/
- public static double dayCompare(Date fromDate, Date toDate,boolean plusOneSec) {
+ public static double dayCompare(Date fromDate, Date toDate, boolean plusOneSec) {
- if(plusOneSec){
+ if (plusOneSec) {
Calendar toD = Calendar.getInstance();
toD.setTime(toDate);
- toD.add(Calendar.SECOND,1);
+ toD.add(Calendar.SECOND, 1);
toDate = toD.getTime();
}
@@ -866,8 +866,8 @@
Calendar fromDateCal = Calendar.getInstance();
fromDateCal.setTime(fromDate);
fromDateCal.set(Calendar.DAY_OF_MONTH, 1);
- fromDateCal.set(Calendar.HOUR_OF_DAY,0);
- fromDateCal.set(Calendar.MINUTE,0);
+ fromDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ fromDateCal.set(Calendar.MINUTE, 0);
if (fromDate.getTime() > fromDateCal.getTime().getTime()) {
fromDateCal.add(Calendar.MONTH, 1);
firstDay = false;
@@ -878,8 +878,8 @@
Calendar toDateCal = Calendar.getInstance();
toDateCal.setTime(toDate);
toDateCal.set(Calendar.DAY_OF_MONTH, 1);
- toDateCal.set(Calendar.HOUR_OF_DAY,0);
- toDateCal.set(Calendar.MINUTE,0);
+ toDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ toDateCal.set(Calendar.MINUTE, 0);
if (toDate.getTime() > toDateCal.getTime().getTime()) {
toDateFirstDate = toDateCal.getTime();
@@ -933,4 +933,16 @@
endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
return endDate.getTime();
}
+
+ public static String getNextSecTime(String time) {
+ Date tTime = getDateFromStringA(time);
+ return getNextSecTime(tTime);
+ }
+
+ public static String getNextSecTime(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.add(Calendar.SECOND, 1);
+ return getFormatTimeStringA(calendar.getTime());
+ }
}
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
index 8cae930..9b12ed5 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
@@ -127,7 +127,7 @@
}
Date maxEndTime = feeDtos.get(0).getDeadlineTime();
//鍛ㄦ湡鎬ц垂鐢�
- if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (maxEndTime == null) {
maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
}
@@ -230,7 +230,7 @@
PayFeePo payFeePo = new PayFeePo();
payFeePo.setFeeId(payFeeDataDto.getFeeId());
- payFeePo.setEndTime(payFeeDetailPo.getEndTime());
+ payFeePo.setEndTime(DateUtil.getNextSecTime(payFeeDetailPo.getEndTime()));
payFeePo.setState(FeeDto.STATE_FINISH);
Date maxTime = payFeeDataDto.getFeeDto().getDeadlineTime();
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index 47bd7de..d2a74df 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -142,7 +143,7 @@
feeDto = feeDtos.get(0);
if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
- throw new IllegalArgumentException("鏀惰垂宸茬粡缁撴潫锛屼笉鑳藉啀缂磋垂");
+ throw new CmdException("鏀惰垂宸茬粡缁撴潫锛屼笉鑳藉啀缂磋垂");
}
Date endTime = feeDto.getEndTime();
@@ -151,22 +152,15 @@
feeConfigDto.setConfigId(feeDto.getConfigId());
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
-
- if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
- throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
+ if (ListUtil.isNull(feeConfigDtos)) {
+ throw new CmdException("璐圭敤椤逛笉瀛樺湪");
}
- //涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
+ // 鑾峰彇璐圭敤缁撴潫鏃堕棿
Date maxEndTime = feeDtos.get(0).getDeadlineTime();
//鍛ㄦ湡鎬ц垂鐢�
- if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (maxEndTime == null) {
maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
}
-// Date maxEndTime = null;
-// if (!StringUtil.isEmpty(feeDto.getFeeFlag()) && feeDto.getFeeFlag().equals(FeeDto.FEE_FLAG_CYCLE)) { //鍛ㄦ湡鎬ц垂鐢�
-// maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
-// } else { //涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
-// maxEndTime = feeDtos.get(0).getDeadlineTime();
-// }
if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeDtos.get(0).getFeeFlag())) {
Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
@@ -179,9 +173,7 @@
for (int paramIndex = 0; paramIndex < selectUserAccount.size(); paramIndex++) {
JSONObject param = selectUserAccount.getJSONObject(paramIndex);
String maximumNumber = param.getString("maximumNumber");
-
}
-
//todo 鏄惁鎸夌即璐规椂闂存缂磋垂
@@ -189,7 +181,7 @@
//todo 鏍￠獙 浼樻儬
JSONArray selectDiscounts = reqJson.getJSONArray("selectDiscount");
- if(!ListUtil.isNull(selectDiscounts)) {
+ if (!ListUtil.isNull(selectDiscounts)) {
for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
JSONObject param = selectDiscounts.getJSONObject(discountIndex);
Assert.hasKeyAndValue(param, "discountId", "鏈寘鍚紭鎯營D");
@@ -205,7 +197,7 @@
logger.debug("paramObj : {}", paramObj);
String payOrderId = paramObj.getString("payOrderId");
- String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
UserDto userDto = new UserDto();
userDto.setUserId(userId);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
@@ -227,16 +219,18 @@
FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
endTime = feeInfo.getEndTime();
feeDetail.put("payableAmount", feeDetail.getString("receivableAmount"));
- //todo 灏佽 淇敼璐圭敤鏃堕棿鎶ユ枃
- JSONObject fee = modifyFee(paramObj);
- payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
+
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
payFeeDetailPo.setReceivableAmount(feeDetail.getString("totalFeePrice"));
//todo 缂撳瓨鏀舵嵁缂栧彿
CommonCache.setValue(payFeeDetailPo.getDetailId() + CommonCache.RECEIPT_CODE, receiptCode, CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
+ //todo 灏佽 淇敼璐圭敤鏃堕棿鎶ユ枃
+ JSONObject fee = modifyFee(paramObj, payFeeDetailPo);
+ payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
+
//todo 鍒ゆ柇鏄惁鏈夋姌鎵ｈ鍒�
- hasDiscount(paramObj, payFeePo, payFeeDetailPo,feeInfo);
+ hasDiscount(paramObj, payFeePo, payFeeDetailPo, feeInfo);
// todo 澶勭悊鐢ㄦ埛璐︽埛
dealUserAccount(paramObj, payFeeDetailPo);
@@ -450,7 +444,7 @@
* @param payFeeDetailPo
* @throws ParseException
*/
- private void hasDiscount(JSONObject paramObj, PayFeePo payFeePo, PayFeeDetailPo payFeeDetailPo,FeeDto feeDto) throws ParseException {
+ private void hasDiscount(JSONObject paramObj, PayFeePo payFeePo, PayFeeDetailPo payFeeDetailPo, FeeDto feeDto) throws ParseException {
if (!paramObj.containsKey("selectDiscount")) {
return;
}
@@ -596,7 +590,7 @@
feeDto.setCommunityId(paramObj.getString("communityId"));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- if (feeDtos == null || feeDtos.size() < 1) {
+ if (ListUtil.isNull(feeDtos)) {
return;
}
if (!FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDtos.get(0).getPayerObjType())) {
@@ -609,7 +603,7 @@
ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+ if (ListUtil.isNull(ownerCarDtos)) {
return;
}
//鑾峰彇杞︿綅id
@@ -778,7 +772,6 @@
}
feeDto = feeDtos.get(0);
businessFeeDetail.put("startTime", DateUtil.getFormatTimeStringA(feeDto.getEndTime()));
- int hours = 0;
Date targetEndTime = null;
BigDecimal cycles = null;
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
@@ -871,60 +864,15 @@
return businessFeeDetail;
}
- public JSONObject modifyFee(JSONObject paramInJson) {
+ public JSONObject modifyFee(JSONObject paramInJson, PayFeeDetailPo payFeeDetailPo) {
JSONObject businessFee = new JSONObject();
FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
- Date endTime = feeInfo.getEndTime();
- Calendar endCalender = Calendar.getInstance();
- endCalender.setTime(endTime);
- int hours = 0;
- //-101鑷畾涔夐噾棰� -102鑷畾涔夊懆鏈� -103 鑷畾涔夌粨鏉熸椂闂�
- if ("-101".equals(paramInJson.getString("cycles"))) {
- endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
- } else if ("-103".equals(paramInJson.getString("cycles"))) {
- String custEndTime = paramInJson.getString("custEndTime");
- Date endDates = DateUtil.getDateFromStringB(custEndTime);
- Calendar c = Calendar.getInstance();
- c.setTime(endDates);
- c.add(Calendar.DAY_OF_MONTH, 1);
- endDates = c.getTime();//杩欐槸鏄庡ぉ
- endCalender.setTime(endDates);
- } else if ("-105".equals(paramInJson.getString("cycles"))) {
- String customEndTime = paramInJson.getString("customEndTime");
- Date endDates = DateUtil.getDateFromStringB(customEndTime);
- Calendar c = Calendar.getInstance();
- c.setTime(endDates);
- c.add(Calendar.DAY_OF_MONTH, 1);
- endDates = c.getTime();//杩欐槸鏄庡ぉ
- endCalender.setTime(endDates);
- } else {
- 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());
- 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();
- }
+ String endTime = DateUtil.getNextSecTime(payFeeDetailPo.getEndTime());
+ feeInfo.setEndTime(DateUtil.getDateFromStringA(endTime));
- //濡傛灉闂存瓏鎬ц垂鐢ㄦ病鏈夎缃粨鏉熸椂闂� 鍒欏彇璐圭敤椤圭殑
+ Date maxEndTime = feeInfo.getMaxEndTime();
if (maxEndTime == null) {
maxEndTime = feeInfo.getConfigEndTime();
}
@@ -965,7 +913,7 @@
public void dealAccount(JSONObject paramObj) {
//鍒ゆ柇閫夋嫨鐨勮处鍙�
JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
- if (jsonArray == null || jsonArray.size() < 1) {
+ if (ListUtil.isNull(jsonArray)) {
return;
}
List<AccountDto> accountDtos = new ArrayList<>();
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 da7f8f7..03c83eb 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -145,7 +146,7 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext dataFlowContext, JSONObject paramObj) throws CmdException, ParseException {
logger.info("======娆犺垂缂磋垂杩斿洖======锛�" + JSONArray.toJSONString(paramObj));
- String userId = dataFlowContext.getReqHeaders().get("user-id");
+ String userId = CmdContextUtils.getUserId(dataFlowContext);
UserDto userDto = new UserDto();
userDto.setUserId(userId);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
@@ -223,15 +224,15 @@
FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
- feeMap.put("endTime", paramInJson.getString("endTime"));
+ feeMap.put("endTime", DateUtil.getNextSecTime(paramInJson.getString("endTime")));
feeMap.put("cycles", paramInJson.getString("cycles"));
feeMap.put("configEndTime", feeInfo.getConfigEndTime());
if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) { //缂磋垂缁撴潫
feeMap.put("state", FeeDto.STATE_FINISH);
}
- Date maxEndTime = feeInfo.getConfigEndTime();
- if (!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
- maxEndTime = feeInfo.getDeadlineTime();
+ Date maxEndTime = feeInfo.getMaxEndTime();
+ if (maxEndTime == null) {
+ maxEndTime = feeInfo.getConfigEndTime();
}
if (maxEndTime != null) { //杩欓噷鏁版嵁闂鐨勬儏鍐典笅
Date endTime = DateUtil.getDateFromStringA(paramInJson.getString("endTime"));
--
Gitblit v1.8.0