From a40c2eb885bcdb697c2e16dae4f43cb6cd718973 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 11:28:03 +0800
Subject: [PATCH] 优化小区数据
---
service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java | 101 ++++++++------------------------------------------
1 files changed, 17 insertions(+), 84 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 dffb0db..1cd54a0 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
@@ -19,10 +19,7 @@
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.fee.*;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.printer.IPrinter;
import com.java110.po.fee.PayFeeDetailPo;
@@ -30,6 +27,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;
@@ -55,26 +53,6 @@
private static Logger logger = LoggerFactory.getLogger(PayFeeReceiptAdapt.class);
- @Autowired
- private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
-
- @Autowired
- private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
-
- @Autowired
- private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
-
- @Autowired
- private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
- @Autowired
- private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
-
- @Autowired
- private IComputeFeeSMO computeFeeSMOImpl;
-
- //閿�(閫�璐规敹鎹紑鍏�)
- public static final String REFUND_RECEIPT_SWITCH = "REFUND_RECEIPT_SWITCH";
@Autowired
private IPrinterRuleFeeV1InnerServiceSMO printerRuleFeeV1InnerServiceSMOImpl;
@@ -87,6 +65,14 @@
@Autowired
private IMachinePrinterV1InnerServiceSMO machinePrinterV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+
+ @Autowired
+ private IGeneratorFeeReceiptInnerServiceSMO generatorFeeReceiptInnerServiceSMOImpl;
+
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
@@ -136,67 +122,13 @@
}
private void doPayFeeDetail(Business business, JSONObject businessPayFeeDetail) {
- try {
- //鏌ヨ缂磋垂鏄庣粏
- PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessPayFeeDetail, PayFeeDetailPo.class);
- FeeDto feeDto = new FeeDto();
- 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);
- //鑾峰彇灏忓尯閰嶇疆閲岄��璐规敹鎹紑鍏�(open寮�;off鍏�)
- String refundReceiptSwitch = CommunitySettingFactory.getValue(payFeeDetailPo.getCommunityId(), REFUND_RECEIPT_SWITCH);
- // if received amount lt zero
- if (!StringUtil.isEmpty(refundReceiptSwitch) && refundReceiptSwitch.equals("off") && businessPayFeeDetail.containsKey("receivedAmount")
- && businessPayFeeDetail.getDoubleValue("receivedAmount") < 0) {
- return;
- }
- //娣诲姞鏀舵嵁鍜屾敹鎹鎯�
- FeeReceiptPo feeReceiptPo = new FeeReceiptPo();
- FeeReceiptDetailPo feeReceiptDetailPo = new FeeReceiptDetailPo();
- feeReceiptDetailPo.setAmount(businessPayFeeDetail.getString("receivedAmount"));
- feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
- feeReceiptDetailPo.setCycle(businessPayFeeDetail.getString("cycles"));
- feeReceiptDetailPo.setDetailId(businessPayFeeDetail.getString("detailId"));
- feeReceiptDetailPo.setEndTime(businessPayFeeDetail.getString("endTime"));
- feeReceiptDetailPo.setFeeId(feeDto.getFeeId());
- 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());
- feeReceiptPo.setReceiptId(feeReceiptDetailPo.getReceiptId());
- feeReceiptPo.setObjType(feeDto.getPayerObjType());
- feeReceiptPo.setObjId(feeDto.getPayerObjId());
- feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
- feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
- feeReceiptPo.setPayObjName(ownerDto.getName());
- feeReceiptPo.setCreateTime(payFeeDetailPo.getCreateTime());
- //杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
- feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
- feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
+ //鏌ヨ缂磋垂鏄庣粏
+ PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessPayFeeDetail, PayFeeDetailPo.class);
+ generatorFeeReceiptInnerServiceSMOImpl.generator(payFeeDetailPo);
- // 鏄惁閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 濡傛灉閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 鑷姩鎵撳嵃
- 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);
- logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
- saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
- logger.error("閫氱煡寮傚父", e);
- }
+ //todo 鏄惁閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 濡傛灉閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 鑷姩鎵撳嵃
+ autoPrintReceipt(payFeeDetailPo.getDetailId(), payFeeDetailPo.getCommunityId());
}
-
-
private void autoPrintReceipt(String detailId, String communityId) {
@@ -261,9 +193,10 @@
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