From 7007db947ea409a973aee8a681ee86cf9d2708bf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 六月 2023 18:54:52 +0800
Subject: [PATCH] 优化1.5 的bug
---
service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java | 150 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 106 insertions(+), 44 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 38e6c9e..9a5b7b7 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
@@ -7,7 +7,7 @@
import com.java110.core.factory.WechatFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeCollectionOrder.FeeCollectionOrderDto;
+import com.java110.dto.fee.FeeCollectionOrderDto;
import com.java110.dto.logSystemError.LogSystemErrorDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
@@ -32,22 +32,26 @@
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.po.feeCollectionDetail.FeeCollectionDetailPo;
+import com.java110.po.feeCollectionOrder.FeeCollectionOrderPo;
import com.java110.po.logSystemError.LogSystemErrorPo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.constant.WechatConstant;
+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 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.*;
@@ -135,16 +139,19 @@
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
reportOweFeeDto.setCommunityId(communityDto.getCommunityId());
reportOweFeeDto.setHasOweFee("Y");
- long oweCount = reportOweFeeInnerServiceSMOImpl.queryReportOweFeesCount(reportOweFeeDto);
+ int oweCount = reportOweFeeInnerServiceSMOImpl.queryReportOweFeesCount(reportOweFeeDto);
if (oweCount == 0) {
return;
}
- double maxPage = Math.ceil(oweCount / DEFAULT_FEE_COUNT);
+ int maxPage = (int) Math.ceil(oweCount * 1.0 / DEFAULT_FEE_COUNT);
- for (int roomIndex = 0; roomIndex < maxPage; roomIndex++) {
+ for (int roomIndex = 1; roomIndex <= maxPage; roomIndex++) {
try {
- doReportOweFeePushMessage(roomIndex * DEFAULT_FEE_COUNT, (roomIndex + 1) * DEFAULT_FEE_COUNT, communityDto, feeCollectionOrderDtos.get(0));
+ doReportOweFeePushMessage(roomIndex, DEFAULT_FEE_COUNT, communityDto, feeCollectionOrderDtos.get(0));
+ FeeCollectionOrderPo feeCollectionOrderPo = BeanConvertUtil.covertBean(feeCollectionOrderDtos.get(0), FeeCollectionOrderPo.class);
+ feeCollectionOrderPo.setState("F");
+ feeCollectionOrderInnerServiceSMOImpl.updateFeeCollectionOrder(feeCollectionOrderPo);
} catch (Exception e) {
LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
@@ -154,6 +161,7 @@
logger.error("娆犺垂鎺ㄩ�佸け璐�" + communityDto.getCommunityId(), e);
}
}
+
}
private void doReportOweFeePushMessage(int page, int row, CommunityDto communityDto, FeeCollectionOrderDto feeCollectionOrderDto) {
@@ -164,8 +172,12 @@
reportOweFeeDto.setRow(row);
List<ReportOweFeeDto> reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportOweFees(reportOweFeeDto);
refreshReportOwe(reportOweFeeDtos);
+ if (reportOweFeeDtos.size() > 0) {
+ pushMessage(reportOweFeeDtos, feeCollectionOrderDto);
+ } else {
+ logger.error("褰撳墠娌℃湁娆犺垂淇℃伅" + communityDto.getCommunityId());
+ }
- pushMessage(reportOweFeeDtos, feeCollectionOrderDto);
}
private void pushMessage(List<ReportOweFeeDto> reportOweFeeDtos, FeeCollectionOrderDto feeCollectionOrderDto) {
@@ -194,35 +206,40 @@
ResultVo resultVo = null;
switch (feeCollectionOrderDto.getCollectionWay()) {
case FeeCollectionOrderDto.COLLECTION_WAY_SMS:
- resultVo = doSendSms(reportOweFeeDo, feeCollectionOrderDto);
+ resultVo = doSendSms(reportOweFeeDo, feeCollectionOrderDto);//鐭俊
feeCollectionDetailPo.setCollectionWay(FeeCollectionOrderDto.COLLECTION_WAY_SMS);
break;
case FeeCollectionOrderDto.COLLECTION_WAY_WECHAT:
- resultVo = doSendWechat(reportOweFeeDo, feeCollectionOrderDto);
- feeCollectionDetailPo.setCollectionWay(FeeCollectionOrderDto.COLLECTION_WAY_WECHAT);
+ if(StringUtil.isEmpty(reportOweFeeDo.getOwnerId()) || "-1".equals(reportOweFeeDo.getOwnerId())){
+ return;
+ }
+ if (!StringUtil.isEmpty(reportOweFeeDo.getOwnerId())) {
+ Map paramInfo = getOwnerAppUserDto(feeCollectionOrderDto.getCommunityId(), reportOweFeeDo.getOwnerId());
+ resultVo = doSendWechat(reportOweFeeDo, feeCollectionOrderDto, paramInfo);//寰俊
+ feeCollectionDetailPo.setCollectionWay(FeeCollectionOrderDto.COLLECTION_WAY_WECHAT);
+ }
break;
case FeeCollectionOrderDto.COLLECTION_WAY_WECHAT_SMS:
- resultVo = doSendWechatOrSms(reportOweFeeDo, feeCollectionOrderDto, feeCollectionDetailPo);
+ resultVo = doSendWechatOrSms(reportOweFeeDo, feeCollectionOrderDto, feeCollectionDetailPo);//鐭俊鎴栬�呭井淇�
break;
}
-
-
- feeCollectionDetailPo.setCollectionName(feeCollectionOrderDto.getCollectionName());
- feeCollectionDetailPo.setCommunityId(feeCollectionOrderDto.getCommunityId());
- feeCollectionDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- feeCollectionDetailPo.setFeeName(feeCollectionOrderDto.getCollectionName() + "娆犺垂");
- feeCollectionDetailPo.setOrderId(feeCollectionOrderDto.getOrderId());
- feeCollectionDetailPo.setOweAmount(reportOweFeeDo.getAmountOwed());
- feeCollectionDetailPo.setOwnerId(reportOweFeeDo.getOwnerId());
- feeCollectionDetailPo.setOwnerName(reportOweFeeDo.getOwnerName());
- feeCollectionDetailPo.setPayerObjId(reportOweFeeDo.getPayerObjId());
- feeCollectionDetailPo.setPayerObjName(reportOweFeeDo.getPayerObjName());
- feeCollectionDetailPo.setPayerObjType(reportOweFeeDo.getPayerObjType());
- feeCollectionDetailPo.setState(resultVo.getCode() == ResultVo.CODE_OK ? FeeCollectionOrderDto.STATE_FINISH : FeeCollectionOrderDto.STATE_ERROR);
- feeCollectionDetailPo.setRemarks(resultVo.getMsg().length() > 512 ? resultVo.getMsg().substring(0, 450) : resultVo.getMsg());
- feeCollectionDetailInnerServiceSMOImpl.saveFeeCollectionDetail(feeCollectionDetailPo);
-
-
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", resultVo);
+ if (resultVo != null) {
+ feeCollectionDetailPo.setCollectionName(feeCollectionOrderDto.getCollectionName());
+ feeCollectionDetailPo.setCommunityId(feeCollectionOrderDto.getCommunityId());
+ feeCollectionDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ feeCollectionDetailPo.setFeeName(feeCollectionOrderDto.getCollectionName() + "娆犺垂");
+ feeCollectionDetailPo.setOrderId(feeCollectionOrderDto.getOrderId());
+ feeCollectionDetailPo.setOweAmount(reportOweFeeDo.getAmountOwed());
+ feeCollectionDetailPo.setOwnerId(reportOweFeeDo.getOwnerId());
+ feeCollectionDetailPo.setOwnerName(reportOweFeeDo.getOwnerName());
+ feeCollectionDetailPo.setPayerObjId(reportOweFeeDo.getPayerObjId());
+ feeCollectionDetailPo.setPayerObjName(reportOweFeeDo.getPayerObjName());
+ feeCollectionDetailPo.setPayerObjType(reportOweFeeDo.getPayerObjType());
+ feeCollectionDetailPo.setState(resultVo.getCode() == ResultVo.CODE_OK ? FeeCollectionOrderDto.STATE_FINISH : FeeCollectionOrderDto.STATE_ERROR);
+ feeCollectionDetailPo.setRemarks(resultVo.getMsg().length() > 512 ? resultVo.getMsg().substring(0, 450) : resultVo.getMsg());
+ feeCollectionDetailInnerServiceSMOImpl.saveFeeCollectionDetail(feeCollectionDetailPo);
+ }
}
/**
@@ -232,13 +249,13 @@
* @param feeCollectionOrderDto
*/
private ResultVo doSendWechatOrSms(ReportOweFeeDto reportOweFeeDo, FeeCollectionOrderDto feeCollectionOrderDto, FeeCollectionDetailPo feeCollectionDetailPo) {
- Map paramInfo = getOwnerAppUserDto(feeCollectionOrderDto.getCommunityId(), reportOweFeeDo.getOwnerId());
+ Map paramInfo = getOwnerAppUserDto(feeCollectionOrderDto.getCommunityId(), reportOweFeeDo.getOweId());
if (paramInfo == null) {
feeCollectionDetailPo.setCollectionWay(FeeCollectionOrderDto.COLLECTION_WAY_SMS);
- return doSendSms(reportOweFeeDo, feeCollectionOrderDto);
+ return doSendSms(reportOweFeeDo, feeCollectionOrderDto);//鐭俊鎺ㄩ��
}
feeCollectionDetailPo.setCollectionWay(FeeCollectionOrderDto.COLLECTION_WAY_WECHAT);
- return doSendWechat(reportOweFeeDo, feeCollectionOrderDto, paramInfo);
+ return doSendWechat(reportOweFeeDo, feeCollectionOrderDto, paramInfo);//寰俊鎺ㄩ��
}
/**
@@ -267,32 +284,48 @@
}
String templateId = paramInfo.get("templateId").toString();
String url = paramInfo.get("url").toString();
- String oweRoomUrl = paramInfo.get("oweCarUrl").toString();
+ String oweRoomUrl = paramInfo.get("oweRoomUrl").toString();
String oweCarUrl = paramInfo.get("oweCarUrl").toString();
SmallWeChatDto weChatDto = (SmallWeChatDto) paramInfo.get("weChatDto");
- Miniprogram miniprogram = paramInfo.get("oweCarUrl") == null ? null : (Miniprogram) paramInfo.get("oweCarUrl");
+ Miniprogram miniprogram = paramInfo.get("miniprogram") == null ? null : (Miniprogram) paramInfo.get("miniprogram");
List<OwnerAppUserDto> ownerAppUserDtos = (List<OwnerAppUserDto>) paramInfo.get("ownerAppUserDtos");
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;
+ String[] roomName = new String[]{};
+ if ("3333".equals(reportOweFeeDo.getPayerObjType())) {
+ roomName = itemDto.getPayerObjName().split("-",3);
+ }
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("鐗╀笟璐圭即璐规彁閱�"));*/
data.setFirst(new Content(itemDto.getFeeName() + "鎻愰啋"));
- data.setKeyword1(new Content(itemDto.getPayerObjName()));
- data.setKeyword2(new Content(itemDto.getAmountOwed()));
+ 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(itemDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_B)));
- data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
+ + 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());
@@ -336,12 +369,29 @@
return new ResultVo(ResultVo.CODE_ERROR, "鏈厤缃煭淇′俊鎭�");
}
Object paramIn = null;
- if ("ALI".equals(smsConfigDto.getSmsType())) {
+ List<ReportOweFeeItemDto> itemDtos = reportOweFeeDo.getItems();
+ //鑾峰彇鐢ㄦ埛缂磋垂鍒版湡鏃堕棿
+ Date endTime = itemDtos.get(0).getEndTime();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(endTime);
+ calendar.add(Calendar.DATE, -1);
+ endTime = calendar.getTime();
+ SmsConfigDto smsConfigDto1 = BeanConvertUtil.covertBean(smsConfigDtos.get(0), SmsConfigDto.class);
+ // 灏婃暚鐨勪笟涓�${user}锛屾偍${house}鐨�${feeType}锛岃处鍗曟棩鏈�${date}鑷�${date2}锛岀即璐归噾棰濓細${mount}鍏冿紝璇峰強鏃剁即璐�
+ if ("ALI".equals(smsConfigDto1.getSmsType())) {
JSONObject param = new JSONObject();
param.put("user", reportOweFeeDo.getOwnerName());
param.put("house", reportOweFeeDo.getPayerObjName());
- param.put("amountOwed", reportOweFeeDo.getAmountOwed());
+ param.put("feeType", itemDtos.get(0).getFeeName());
+ param.put("date", DateUtil.getFormatTimeString(itemDtos.get(0).getStartTime(), DateUtil.DATE_FORMATE_STRING_B));
+ param.put("date2", DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_B));
+ param.put("mount", reportOweFeeDo.getAmountOwed());
paramIn = param;
+ }else if(SendSmsFactory.SMS_COMPANY_YIDONG.equals(smsConfigDto1.getSmsType())){
+ paramIn = "灏婃暚鐨勪笟涓�"+ reportOweFeeDo.getOwnerName()+"锛屾偍"+reportOweFeeDo.getPayerObjName()+"鐨�"+itemDtos.get(0).getFeeName()
+ +"锛岃处鍗曟棩鏈�"+DateUtil.getFormatTimeString(itemDtos.get(0).getStartTime(), DateUtil.DATE_FORMATE_STRING_B)
+ +"鑷�"+DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_B)
+ +"锛岀即璐归噾棰濓細"+reportOweFeeDo.getAmountOwed()+"鍏冿紝璇峰強鏃剁即璐�";
} else {
paramIn = new String[]{
reportOweFeeDo.getOwnerName(),
@@ -360,13 +410,14 @@
}
ResultVo resultVo = null;
for (OwnerDto ownerDto1 : ownerDtos) {
- resultVo = SendSmsFactory.sendOweFeeSms(ownerDto1.getLink(), smsConfigDto, paramIn);
+ resultVo = SendSmsFactory.sendOweFeeSms(ownerDto1.getLink(), smsConfigDto1, paramIn);
}
return resultVo;
}
private Map getOwnerAppUserDto(String communityId, String memberId) {
+
SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setWeChatType("1100");
smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
@@ -404,6 +455,7 @@
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setCommunityId(weChatDto.getObjId());
ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
+ ownerAppUserDto.setMemberId(memberId);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
@@ -416,8 +468,8 @@
}
String url = sendTemplate + accessToken;
- String oweRoomUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
- String oweCarUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_CAR_FEE_PAGE);
+ String oweRoomUrl = UrlCache.getOwnerUrl()+MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
+ String oweCarUrl = UrlCache.getOwnerUrl()+MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_CAR_FEE_PAGE);
Miniprogram miniprogram = null;
if (oweRoomUrl.contains("@@")) {
miniprogram = new Miniprogram();
@@ -452,19 +504,23 @@
}
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);
reportOweFee.setOweId(reportOweFees.get(0).getOweId());
+ reportOweFee.setOwnerId(reportOweFees.get(0).getOwnerId());
reportOweFee.setOwnerName(reportOweFees.get(0).getOwnerName());
} else if (reportOweFee.getPayerObjType().equals("6666")) {
List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFeesByCar(reportOwe);
reportOweFee.setOweId(reportOweFees.get(0).getOweId());
+ reportOweFee.setOwnerId(reportOweFees.get(0).getOwnerId());
reportOweFee.setOwnerName(reportOweFees.get(0).getOwnerName());
}
reportOweFeeDtos.add(reportOweFee);
@@ -510,6 +566,12 @@
if (!StringUtil.isEmpty(reportOweFeeDto.getOwnerName()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerName())) {
oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
}
+ if (!StringUtil.isEmpty(reportOweFeeDto.getOwnerId()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerId())) {
+ oldReportOweFeeDto.setOwnerId(reportOweFeeDto.getOwnerId());
+ }
+ if (!StringUtil.isEmpty(reportOweFeeDto.getPayerObjType()) && StringUtil.isEmpty(oldReportOweFeeDto.getPayerObjType())) {
+ oldReportOweFeeDto.setPayerObjType(reportOweFeeDto.getPayerObjType());
+ }
oldReportOweFeeDto.setUpdateTime(reportOweFeeDto.getUpdateTime());
oldReportOweFeeDto.setConfigName(reportOweFeeDto.getConfigName());
}
--
Gitblit v1.8.0