From 7a5745e0259a797456973721afe962459fc177be Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 04 八月 2021 10:07:51 +0800
Subject: [PATCH] 优化代码

---
 service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
index 6f68d28..a874307 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
@@ -90,7 +90,7 @@
 
         importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
         for (ImportRoomFee importRoomFee : importRoomFees) {
-            if(StringUtil.isEmpty(importRoomFee.getRoomId())){
+            if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
                 continue;
             }
             importFeeDetail(importRoomFee, storeId, userId);
@@ -102,6 +102,9 @@
 
         importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
         for (ImportRoomFee importCarFee : importCarFees) {
+            if (StringUtil.isEmpty(importCarFee.getCarId())) {
+                continue;
+            }
             importCarFeeDetail(importCarFee, storeId, userId);
         }
     }
@@ -142,7 +145,11 @@
                 payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
                 payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
                 payFeePo.setIncomeObjId(storeId);
-                payFeePo.setState(FeeDto.STATE_DOING);
+                if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
+                    payFeePo.setState(FeeDto.STATE_FINISH);
+                } else {
+                    payFeePo.setState(FeeDto.STATE_DOING);
+                }
                 payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
                 payFeePo.setPayerObjId(importRoomFee.getCarId());
                 payFeePo.setUserId(userId);
@@ -202,7 +209,11 @@
                 payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
                 payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
                 payFeePo.setIncomeObjId(storeId);
-                payFeePo.setState(FeeDto.STATE_DOING);
+                if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
+                    payFeePo.setState(FeeDto.STATE_FINISH);
+                } else {
+                    payFeePo.setState(FeeDto.STATE_DOING);
+                }
                 payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
                 payFeePo.setPayerObjId(importRoomFee.getRoomId());
                 payFeePo.setUserId(userId);
@@ -219,7 +230,7 @@
         for (FeeDto tmpFeeDto : feeDtos) {
             try {
                 doImportFeeDetail(tmpFeeDto, importRoomFee);
-            } catch (ParseException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
@@ -254,6 +265,7 @@
         payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
         payFeeDetailPo.setRemark(importRoomFee.getRemark());
         payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
+        payFeeDetailPo.setState("1400");
         int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
 
         if (saved < 1) {
@@ -270,6 +282,10 @@
         payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
         payFeePo.setFeeId(tmpFeeDto.getFeeId());
         payFeePo.setEndTime(importRoomFee.getEndTime());
+        if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
+            payFeePo.setState(FeeDto.STATE_FINISH);
+        }
+
         feeInnerServiceSMOImpl.updateFee(payFeePo);
     }
 

--
Gitblit v1.8.0