From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
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 1358a99..c6e5f56 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
@@ -19,14 +19,17 @@
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.community.*;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
+import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.FeeFlagTypeConstant;
import com.java110.utils.constant.FeeConfigConstant;
import com.java110.utils.constant.ResponseConstant;
@@ -98,6 +101,12 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -134,15 +143,15 @@
throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
}
Date maxEndTime = feeDtos.get(0).getDeadlineTime();
- if (!FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
- try {
- maxEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
- } catch (ParseException e) {
- logger.error("姣旇緝璐圭敤鏃ユ湡澶辫触", e);
- }
- Date newDate = DateUtil.stepMonth(endTime, paramInObj.getInteger("cycles") - 1);
+ //鍛ㄦ湡鎬ц垂鐢�
+ if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
+ }
+
+ if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
if (newDate.getTime() > maxEndTime.getTime()) {
- throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
+ throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿,璇风敤鎸夌粨鏉熸椂闂存柟寮忕即璐�");
}
}
@@ -152,24 +161,38 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+
+ //todo 鐢熸垚鏀舵嵁缂栧彿
+ String receiptCode = feeReceiptInnerServiceSMOImpl.generatorReceiptCode(reqJson.getString("communityId"));
+
+
JSONArray fees = reqJson.getJSONArray("fees");
JSONObject paramInObj = null;
- JSONArray datas = new JSONArray();
+ JSONArray details = new JSONArray();
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
try {
paramInObj = fees.getJSONObject(feeIndex);
- doDeal(paramInObj, reqJson.getString("communityId"), cmdDataFlowContext);
+ doDeal(paramInObj, reqJson.getString("communityId"),receiptCode, cmdDataFlowContext, userDtos.get(0));
} catch (Exception e) {
logger.error("澶勭悊寮傚父", e);
throw new CmdException(e.getMessage());
}
- datas.add(paramInObj.getString("detailId"));
+ details.add(paramInObj.getString("detailId"));
}
- cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(datas));
+ JSONObject data = new JSONObject();
+ data.put("details",details);
+
+ cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(data));
}
- private void doDeal(JSONObject paramObj, String communityId, ICmdDataFlowContext cmdDataFlowContext) throws Exception {
+ private void doDeal(JSONObject paramObj, String communityId,String receiptCode, ICmdDataFlowContext cmdDataFlowContext, UserDto userDto) throws Exception {
paramObj.put("communityId", communityId);
//鑾峰彇璁㈠崟ID
String oId = Java110TransactionalFactory.getOId();
@@ -182,10 +205,14 @@
DistributedLock.waitGetDistributedLock(key, requestId);
JSONObject feeDetail = addFeeDetail(paramObj);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
- if(StringUtil.isEmpty(oId)){
+ if (StringUtil.isEmpty(oId)) {
oId = payFeeDetailPo.getDetailId();
}
payFeeDetailPo.setPayOrderId(oId);
+ payFeeDetailPo.setCashierId(userDto.getUserId());
+ payFeeDetailPo.setCashierName(userDto.getName());
+ //todo 缂撳瓨鏀舵嵁缂栧彿
+ CommonCache.setValue(payFeeDetailPo.getDetailId()+CommonCache.RECEIPT_CODE,receiptCode,CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
@@ -198,7 +225,7 @@
throw new CmdException("缂磋垂澶辫触");
}
} finally {
- DistributedLock.releaseDistributedLock(requestId, key);
+ DistributedLock.releaseDistributedLock(key,requestId);
}
//杞﹁締寤舵湡
updateOwnerCarEndTime(payFeePo, paramObj);
--
Gitblit v1.8.0