From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java
index 08c6eec..12dc71f 100644
--- a/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java
@@ -43,13 +43,14 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
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.math.BigDecimal;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.*;
@@ -288,50 +289,60 @@
List<ReportOweFeeItemDto> itemDtos = reportOweFeeDo.getItems();
String oweUrl = "";
for (ReportOweFeeItemDto itemDto : itemDtos) {
+ BigDecimal amountOwed = new BigDecimal(itemDto.getAmountOwed());
oweUrl = FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportOweFeeDo.getPayerObjType()) ? oweRoomUrl : oweCarUrl;
- for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
- try {
- //鑾峰彇鐢ㄦ埛缂磋垂鍒版湡鏃堕棿
- Date endTime = itemDto.getEndTime();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(endTime);
- calendar.add(Calendar.DATE, -1);
- endTime = calendar.getTime();
-
- Data data = new Data();
- PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(appUserDto.getOpenId());
- data.setFirst(new Content(itemDto.getFeeName() + "鎻愰啋"));
- data.setKeyword1(new Content(itemDto.getPayerObjName()));
- data.setKeyword2(new Content(itemDto.getAmountOwed()));
- data.setKeyword3(new Content(
- DateUtil.getFormatTimeString(itemDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_B)
- + "鑷�"
- + DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_B)));
- data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
-
- if (!StringUtil.isEmpty(oweUrl)) {
- if (miniprogram == null) {
- templateMessage.setUrl(oweUrl + itemDto.getPayerObjId() + "&wAppId=" + weChatDto.getAppId());
- } else {
- miniprogram.setPagepath(oweUrl.split("@@")[1] + itemDto.getPayerObjId() + "&wAppId=" + weChatDto.getAppId());
- templateMessage.setMiniprogram(miniprogram);
- }
- }
- templateMessage.setData(data);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
- } catch (Exception e) {
- LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
- logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
- logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_OWE_FEE);
- logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
- saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
- logger.error("娆犺垂鎺ㄩ�佸け璐�" + feeCollectionOrderDto.getCollectionName(), e);
- }
+ String[] roomName = new String[]{};
+ if ("3333".equals(reportOweFeeDo.getPayerObjType())) {
+ roomName = itemDto.getPayerObjName().split("-");
}
+ for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
+ try {
+ //鑾峰彇鐢ㄦ埛缂磋垂鍒版湡鏃堕棿
+ Date endTime = itemDto.getEndTime();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(endTime);
+ calendar.add(Calendar.DATE, -1);
+ endTime = calendar.getTime();
+
+ Data data = new Data();
+ PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
+ templateMessage.setTemplate_id(templateId);
+ templateMessage.setTouser(appUserDto.getOpenId());
+ data.setFirst(new Content(itemDto.getFeeName() + "鎻愰啋"));
+ if ("3333".equals(reportOweFeeDo.getPayerObjType())) {
+ data.setKeyword1(new Content(roomName[0] + "鏍�" + roomName[1] + "鍗曞厓" + roomName[2] + "瀹�"));
+ } else {
+ data.setKeyword1(new Content(itemDto.getPayerObjName()));
+ }
+ DecimalFormat df = new DecimalFormat("0.00");
+ data.setKeyword2(new Content(df.format(amountOwed) + "鍏�"));
+ data.setKeyword3(new Content(
+ DateUtil.getFormatTimeString(itemDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_B)
+ + "鑷�"
+ + DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_B)));
+ data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛橈紒"));
+
+ if (!StringUtil.isEmpty(oweUrl)) {
+ if (miniprogram == null) {
+ templateMessage.setUrl(oweUrl + itemDto.getPayerObjId() + "&wAppId=" + weChatDto.getAppId());
+ } else {
+ miniprogram.setPagepath(oweUrl.split("@@")[1] + itemDto.getPayerObjId() + "&wAppId=" + weChatDto.getAppId());
+ templateMessage.setMiniprogram(miniprogram);
+ }
+ }
+ templateMessage.setData(data);
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ } catch (Exception e) {
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_OWE_FEE);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
+ logger.error("娆犺垂鎺ㄩ�佸け璐�" + feeCollectionOrderDto.getCollectionName(), e);
+ }
+ }
}
return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
@@ -483,11 +494,13 @@
}
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
reportOweFeeDto.setPayerObjIds(payObjIds.toArray(new String[payObjIds.size()]));
+ reportOweFeeDto.setHasOweFee("Y");
List<ReportOweFeeDto> allReportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
List<ReportOweFeeDto> reportOweFeeDtos = new ArrayList<>();
for (ReportOweFeeDto reportOweFee : allReportOweFeeDtos) {
ReportOweFeeDto reportOwe = new ReportOweFeeDto();
reportOwe.setOweId(reportOweFee.getOweId());
+ reportOwe.setHasOweFee("Y");
reportOweFee.setPayerObjType(reportOweFee.getPayerObjType());
if (reportOweFee.getPayerObjType().equals("3333")) {
List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFeesByRoom(reportOwe);
--
Gitblit v1.8.0