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 | 145 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 117 insertions(+), 28 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 8608df0..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,24 +7,31 @@
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.log.LogSystemErrorDto;
+import com.java110.dto.machine.MachinePrinterDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.entity.order.Business;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.dto.printerRule.PrinterRuleDto;
+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.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
-import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
-import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
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;
@@ -49,9 +56,6 @@
private static Logger logger = LoggerFactory.getLogger(PayFeeReceiptAdapt.class);
@Autowired
- private ICommunityInnerServiceSMO communityInnerServiceSMO;
-
- @Autowired
private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
@Autowired
@@ -69,17 +73,19 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
- @Autowired
- private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMO;
@Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMO;
+ private IPrinterRuleFeeV1InnerServiceSMO printerRuleFeeV1InnerServiceSMOImpl;
@Autowired
- private IOwnerInnerServiceSMO ownerInnerServiceSMO;
+ private IPrinterRuleV1InnerServiceSMO printerRuleV1InnerServiceSMOImpl;
@Autowired
- private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMO;
+ private IPrinterRuleMachineV1InnerServiceSMO printerRuleMachineV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMachinePrinterV1InnerServiceSMO machinePrinterV1InnerServiceSMOImpl;
+
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
@@ -90,8 +96,8 @@
public void execute(Business business, List<Business> businesses) {
JSONObject data = business.getData();
- if(data != null){
- logger.debug("璇锋眰鏃ュ織:{}",data);
+ if (data != null) {
+ logger.debug("璇锋眰鏃ュ織:{}", data);
}
JSONArray businessPayFeeDetails = null;
if (data == null) {
@@ -119,7 +125,6 @@
businessPayFeeDetails.add(data);
}
}
-
if (businessPayFeeDetails == null) {
return;
}
@@ -137,18 +142,25 @@
feeDto.setFeeId(payFeeDetailPo.getFeeId());
feeDto.setCommunityId(payFeeDetailPo.getCommunityId());
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
Assert.listOnlyOne(feeDtos, "鏈煡璇㈠埌璐圭敤淇℃伅");
-
feeDto = feeDtos.get(0);
-
//鏌ヨ涓氫富淇℃伅
OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDto);
+ // if received amount lt zero
+ if (businessPayFeeDetail.containsKey("receivedAmount")
+ && 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();
-
feeReceiptDetailPo.setAmount(businessPayFeeDetail.getString("receivedAmount"));
feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
feeReceiptDetailPo.setCycle(businessPayFeeDetail.getString("cycles"));
@@ -158,6 +170,10 @@
feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
feeReceiptDetailPo.setStartTime(businessPayFeeDetail.getString("startTime"));
feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
+ feeReceiptDetailPo.setCreateTime(payFeeDetailPo.getCreateTime());
+ //澶勭悊 灏忔暟鐐瑰悗 0
+ feeDto.setSquarePrice(Double.parseDouble(feeDto.getSquarePrice()) + "");
+ feeDto.setAdditionalAmount(Double.parseDouble(feeDto.getAdditionalAmount()) + "");
computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
@@ -167,11 +183,15 @@
feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
feeReceiptPo.setPayObjName(ownerDto.getName());
-
+ feeReceiptPo.setCreateTime(payFeeDetailPo.getCreateTime());
+ feeReceiptPo.setReceiptCode(receiptCode);
//杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
- }catch (Exception e){
+
+ // 鏄惁閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 濡傛灉閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 鑷姩鎵撳嵃
+ autoPrintReceipt(businessPayFeeDetail.getString("detailId"), feeDto.getCommunityId());
+ } catch (Exception e) {
LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_NOTICE);
@@ -182,4 +202,73 @@
}
+
+ private void autoPrintReceipt(String detailId, String communityId) {
+
+ FeeDetailDto feeDetailDto = new FeeDetailDto();
+ feeDetailDto.setDetailId(detailId);
+ feeDetailDto.setCommunityId(communityId);
+ List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+
+ if (feeDetailDtos == null || feeDetailDtos.size() < 1) {
+ return;
+ }
+
+ PrinterRuleFeeDto printerRuleFeeDto = new PrinterRuleFeeDto();
+ printerRuleFeeDto.setCommunityId(communityId);
+ printerRuleFeeDto.setFeeId(feeDetailDtos.get(0).getConfigId());
+ List<PrinterRuleFeeDto> printerRuleFeeDtos = printerRuleFeeV1InnerServiceSMOImpl.queryPrinterRuleFees(printerRuleFeeDto);
+
+ if (printerRuleFeeDtos == null || printerRuleFeeDtos.size() < 1) {
+ return;
+ }
+
+ PrinterRuleDto printerRuleDto = new PrinterRuleDto();
+ printerRuleDto.setRuleId(printerRuleFeeDtos.get(0).getRuleId());
+ printerRuleDto.setCommunityId(communityId);
+ printerRuleDto.setState(PrinterRuleDto.STATE_NORMAL);
+ int count = printerRuleV1InnerServiceSMOImpl.queryPrinterRulesCount(printerRuleDto);
+
+ if (count < 1) {
+ return;
+ }
+
+ PrinterRuleMachineDto printerRuleMachineDto = new PrinterRuleMachineDto();
+ printerRuleMachineDto.setCommunityId(communityId);
+ printerRuleMachineDto.setRuleId(printerRuleFeeDtos.get(0).getRuleId());
+ List<PrinterRuleMachineDto> printerRuleMachineDtos = printerRuleMachineV1InnerServiceSMOImpl.queryPrinterRuleMachines(printerRuleMachineDto);
+ if (printerRuleMachineDtos == null || printerRuleMachineDtos.size() < 1) {
+ return;
+ }
+
+ for (PrinterRuleMachineDto tmpPrinterRuleMachineDto : printerRuleMachineDtos) {
+ try {
+ doPrint(tmpPrinterRuleMachineDto, detailId);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ }
+
+ private void doPrint(PrinterRuleMachineDto tmpPrinterRuleMachineDto, String detailId) {
+ MachinePrinterDto machinePrinterDto = new MachinePrinterDto();
+ machinePrinterDto.setCommunityId(tmpPrinterRuleMachineDto.getCommunityId());
+ machinePrinterDto.setMachineId(tmpPrinterRuleMachineDto.getMachineId());
+ List<MachinePrinterDto> machinePrinterDtos = machinePrinterV1InnerServiceSMOImpl.queryMachinePrinters(machinePrinterDto);
+
+ Assert.listOnlyOne(machinePrinterDtos, "浜戞墦鍗版満涓嶅瓨鍦�");
+
+ IPrinter printer = ApplicationContextFactory.getBean(machinePrinterDtos.get(0).getImplBean(), IPrinter.class);
+
+ if (printer == null) {
+ throw new CmdException("鎵撳嵃鏈哄紓甯革紝鏈寘鍚�傞厤鍣�");
+ }
+
+ printer.printPayFeeDetail(new String[]{detailId}, tmpPrinterRuleMachineDto.getCommunityId(), Integer.parseInt(tmpPrinterRuleMachineDto.getQuantity()), machinePrinterDtos.get(0),"");
+
+ }
+
+
}
--
Gitblit v1.8.0