From 5c8ea097a69d7a3b46d39a1b6908d999398c415d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 十月 2021 09:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
index ff12d8c..accc6f9 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
@@ -13,7 +13,12 @@
import com.java110.fee.bmo.IImportRoomFee;
import com.java110.fee.listener.fee.UpdateFeeInfoListener;
import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.*;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IImportFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
@@ -95,6 +100,7 @@
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
JSONArray importRoomFees = reqJson.getJSONArray("importRoomFees");
@@ -180,6 +186,7 @@
payFeePo.setFeeTypeCd(feeTypeCd);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importRoomFee.getAmount());
+ payFeePo.setBatchId(batchId);
//payFeePo.setStartTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -301,6 +308,7 @@
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
if (StringUtil.isEmpty(feeName)) {
feeName = IMPORT_FEE_NAME;
@@ -358,6 +366,7 @@
payFeePo.setFeeTypeCd(feeTypeCd);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importCarFee.getAmount());
+ payFeePo.setBatchId(batchId);
//payFeePo.setStartTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -477,6 +486,7 @@
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
if (StringUtil.isEmpty(feeName)) {
feeName = IMPORT_FEE_NAME;
@@ -532,6 +542,7 @@
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importCarFee.getAmount());
payFeePo.setStartTime(importCarFee.getStartTime());
+ payFeePo.setBatchId(batchId);
//payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
payFeePos.add(payFeePo);
--
Gitblit v1.8.0