From 6576659aae76a84c4119239bdf2a5e09d61ead5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 26 七月 2022 10:03:18 +0800
Subject: [PATCH] 优化创建临时收费
---
service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java
index d5f86dc..380b368 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java
@@ -10,16 +10,20 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeFormula.FeeFormulaDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.user.UserDto;
import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.importFee.ImportFeePo;
import com.java110.po.importFeeDetail.ImportFeeDetailPo;
+import com.java110.po.payFeeBatch.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
@@ -69,6 +73,12 @@
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -84,6 +94,9 @@
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
Assert.listOnlyOne(communityDtos, "鏈壘鍒板皬鍖轰俊鎭�");
+
+ //鐢熸垚鎵规
+ generatorBatch(reqJson);
String scope = reqJson.getString("scope");
RoomDto roomDto = new RoomDto();
@@ -299,6 +312,7 @@
payFeePo.setFeeTypeCd(reqJson.getString("feeTypeCd"));
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(amount + "");
+ payFeePo.setBatchId(reqJson.getString("batchId"));
//payFeePo.setStartTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -435,6 +449,7 @@
payFeeConfigPo.setSquarePrice("0");
payFeeConfigPo.setPaymentCycle("1");
payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ payFeeConfigPo.setDeductFrom(FeeConfigDto.DEDUCT_FROM_N);
int saveFlag = feeConfigInnerServiceSMOImpl.saveFeeConfig(payFeeConfigPo);
if (saveFlag < 1) {
@@ -442,4 +457,31 @@
}
}
+ /**
+ * 鐢熸垚鎵规鍙�
+ *
+ * @param reqJson
+ */
+ private void generatorBatch(JSONObject reqJson) {
+ PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
+ payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
+ payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
+ payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
+ UserDto userDto = new UserDto();
+ userDto.setUserId(reqJson.getString("userId"));
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
+ payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
+ payFeeBatchPo.setMsg("姝ｅ父");
+ int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);
+
+ if (flag < 1) {
+ throw new IllegalArgumentException("鐢熸垚鎵规澶辫触");
+ }
+
+ reqJson.put("batchId", payFeeBatchPo.getBatchId());
+ }
+
}
--
Gitblit v1.8.0