From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
index 318b4c5..b32cd32 100644
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
@@ -7,6 +7,8 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.order.BusinessDto;
@@ -15,13 +17,18 @@
import com.java110.entity.order.Orders;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
import com.java110.intf.order.IOrderInnerServiceSMO;
+import com.java110.po.feeReceipt.FeeReceiptPo;
+import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +54,12 @@
private static Logger logger = LoggerFactory.getLogger(PayFeeConfirmListener.class);
@Autowired
+ private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
+
+ @Autowired
private IFeeBMO feeBMOImpl;
@Autowired
@@ -57,6 +70,9 @@
@Autowired
private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
+
+ @Autowired
+ private IComputeFeeSMO computeFeeSMOImpl;
@Override
public String getServiceCode() {
@@ -145,6 +161,7 @@
}
+
/**
* 鍒峰叆order淇℃伅
*
--
Gitblit v1.8.0