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 | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 6e2d2e4..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
@@ -7,18 +7,17 @@
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.logSystemError.LogSystemErrorDto;
-import com.java110.dto.machinePrinter.MachinePrinterDto;
+import com.java110.dto.log.LogSystemErrorDto;
+import com.java110.dto.machine.MachinePrinterDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.printerRule.PrinterRuleDto;
-import com.java110.dto.printerRuleFee.PrinterRuleFeeDto;
-import com.java110.dto.printerRuleMachine.PrinterRuleMachineDto;
-import com.java110.entity.order.Business;
+import com.java110.dto.printerRule.PrinterRuleFeeDto;
+import com.java110.dto.printerRule.PrinterRuleMachineDto;
+import com.java110.dto.system.Business;
import com.java110.intf.common.IMachinePrinterV1InnerServiceSMO;
import com.java110.intf.common.IPrinterRuleFeeV1InnerServiceSMO;
import com.java110.intf.common.IPrinterRuleMachineV1InnerServiceSMO;
import com.java110.intf.common.IPrinterRuleV1InnerServiceSMO;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
@@ -26,17 +25,17 @@
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.printer.IPrinter;
import com.java110.po.fee.PayFeeDetailPo;
-import com.java110.po.feeReceipt.FeeReceiptPo;
-import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
-import com.java110.po.logSystemError.LogSystemErrorPo;
+import com.java110.po.fee.FeeReceiptPo;
+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;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ExceptionUtil;
import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,6 +85,7 @@
@Autowired
private IMachinePrinterV1InnerServiceSMO machinePrinterV1InnerServiceSMOImpl;
+
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
@@ -151,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();
@@ -177,6 +184,7 @@
feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
feeReceiptPo.setPayObjName(ownerDto.getName());
feeReceiptPo.setCreateTime(payFeeDetailPo.getCreateTime());
+ feeReceiptPo.setReceiptCode(receiptCode);
//杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
@@ -258,7 +266,7 @@
throw new CmdException("鎵撳嵃鏈哄紓甯革紝鏈寘鍚�傞厤鍣�");
}
- printer.printPayFeeDetail(new String[]{detailId}, tmpPrinterRuleMachineDto.getCommunityId(), Integer.parseInt(tmpPrinterRuleMachineDto.getQuantity()), machinePrinterDtos.get(0));
+ printer.printPayFeeDetail(new String[]{detailId}, tmpPrinterRuleMachineDto.getCommunityId(), Integer.parseInt(tmpPrinterRuleMachineDto.getQuantity()), machinePrinterDtos.get(0),"");
}
--
Gitblit v1.8.0