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 | 195 +++++++++++++++++++++++++++---------------------
1 files changed, 108 insertions(+), 87 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 51551e1..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
@@ -1,60 +1,43 @@
package com.java110.job.adapt.payment.receipt;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.exceptions.ServerException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
+import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.factory.WechatFactory;
import com.java110.core.smo.IComputeFeeSMO;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
-import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerAppUserDto;
-import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.log.LogSystemErrorDto;
+import com.java110.dto.machine.MachinePrinterDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
-import com.java110.dto.staffAppAuth.StaffAppAuthDto;
-import com.java110.dto.user.UserDto;
-import com.java110.entity.order.Business;
-import com.java110.entity.wechat.Content;
-import com.java110.entity.wechat.Data;
-import com.java110.entity.wechat.PropertyFeeTemplateMessage;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-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.order.IPrivilegeInnerServiceSMO;
-import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
-import com.java110.intf.user.*;
+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.*;
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.utils.cache.MappingCache;
+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.DateUtil;
+import com.java110.utils.util.ExceptionUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
import java.util.List;
import java.util.Map;
@@ -70,36 +53,26 @@
private static Logger logger = LoggerFactory.getLogger(PayFeeReceiptAdapt.class);
- @Autowired
- private ICommunityInnerServiceSMO communityInnerServiceSMO;
-
@Autowired
- private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
+ private IPrinterRuleFeeV1InnerServiceSMO printerRuleFeeV1InnerServiceSMOImpl;
@Autowired
- private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
+ private IPrinterRuleV1InnerServiceSMO printerRuleV1InnerServiceSMOImpl;
@Autowired
- private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+ private IPrinterRuleMachineV1InnerServiceSMO printerRuleMachineV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMachinePrinterV1InnerServiceSMO machinePrinterV1InnerServiceSMOImpl;
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
- @Autowired
- private IComputeFeeSMO computeFeeSMOImpl;
@Autowired
- private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMO;
+ private IGeneratorFeeReceiptInnerServiceSMO generatorFeeReceiptInnerServiceSMOImpl;
- @Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMO;
-
- @Autowired
- private IOwnerInnerServiceSMO ownerInnerServiceSMO;
-
- @Autowired
- private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMO;
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
@@ -109,6 +82,10 @@
@Override
public void execute(Business business, List<Business> businesses) {
JSONObject data = business.getData();
+
+ if (data != null) {
+ logger.debug("璇锋眰鏃ュ織:{}", data);
+ }
JSONArray businessPayFeeDetails = null;
if (data == null) {
FeeDetailDto feeDetailDto = new FeeDetailDto();
@@ -130,9 +107,11 @@
businessPayFeeDetails = (JSONArray) bObj;
}
} else {
- return;
+ if (data instanceof JSONObject) {
+ businessPayFeeDetails = new JSONArray();
+ businessPayFeeDetails.add(data);
+ }
}
-
if (businessPayFeeDetails == null) {
return;
}
@@ -145,37 +124,79 @@
private void doPayFeeDetail(Business business, JSONObject businessPayFeeDetail) {
//鏌ヨ缂磋垂鏄庣粏
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);
+ generatorFeeReceiptInnerServiceSMOImpl.generator(payFeeDetailPo);
- Assert.listOnlyOne(feeDtos, "鏈煡璇㈠埌璐圭敤淇℃伅");
-
- //娣诲姞鍗曞厓淇℃伅
- 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));
- 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));
- //杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
- feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
- feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
+ //todo 鏄惁閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 濡傛灉閰嶇疆浜嗚嚜鍔ㄦ墦鍗板姛鑳� 鑷姩鎵撳嵃
+ autoPrintReceipt(payFeeDetailPo.getDetailId(), payFeeDetailPo.getCommunityId());
}
+ 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