From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 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..99bc83f 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
@@ -32,10 +32,12 @@
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.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;
@@ -142,9 +144,12 @@
double maxPage = Math.ceil(oweCount / 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 +159,7 @@
logger.error("娆犺垂鎺ㄩ�佸け璐�" + communityDto.getCommunityId(), e);
}
}
+
}
private void doReportOweFeePushMessage(int page, int row, CommunityDto communityDto, FeeCollectionOrderDto feeCollectionOrderDto) {
@@ -164,8 +170,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 +204,37 @@
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())) {
+ 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 +244,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,10 +279,10 @@
}
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();
@@ -279,20 +291,26 @@
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("鐗╀笟璐圭即璐规彁閱�"));*/
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(itemDto.getEndTime(), 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());
@@ -336,11 +354,23 @@
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 {
paramIn = new String[]{
@@ -360,7 +390,7 @@
}
ResultVo resultVo = null;
for (OwnerDto ownerDto1 : ownerDtos) {
- resultVo = SendSmsFactory.sendOweFeeSms(ownerDto1.getLink(), smsConfigDto, paramIn);
+ resultVo = SendSmsFactory.sendOweFeeSms(ownerDto1.getLink(), smsConfigDto1, paramIn);
}
return resultVo;
@@ -404,6 +434,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) {
@@ -461,10 +492,12 @@
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 +543,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