From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java b/service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java
index dc855ca..41e5103 100644
--- a/service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java
@@ -29,6 +29,7 @@
import com.java110.po.fee.FeeReceiptDetailPo;
import com.java110.po.log.LogSystemErrorPo;
import com.java110.service.smo.ISaveSystemErrorSMO;
+import com.java110.utils.cache.CommonCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
@@ -150,6 +151,13 @@
&& businessPayFeeDetail.getDoubleValue("receivedAmount") < 0) {
return;
}
+
+ String receiptCode = CommonCache.getValue(payFeeDetailPo.getDetailId()+CommonCache.RECEIPT_CODE);
+ //todo 濡傛灉涓虹┖閲嶆柊鐢熸垚鏀舵嵁缂栧彿
+ if(StringUtil.isEmpty(receiptCode)){
+ receiptCode = feeReceiptInnerServiceSMOImpl.generatorReceiptCode(payFeeDetailPo.getCommunityId());
+ }
+
//娣诲姞鏀舵嵁鍜屾敹鎹鎯�
FeeReceiptPo feeReceiptPo = new FeeReceiptPo();
FeeReceiptDetailPo feeReceiptDetailPo = new FeeReceiptDetailPo();
@@ -176,7 +184,7 @@
feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
feeReceiptPo.setPayObjName(ownerDto.getName());
feeReceiptPo.setCreateTime(payFeeDetailPo.getCreateTime());
- feeReceiptPo.setReceiptCode(businessPayFeeDetail.getString("receiptCode"));
+ feeReceiptPo.setReceiptCode(receiptCode);
//杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
--
Gitblit v1.8.0