From ea6e1675bbd411e30b21369698ed4b0587c21c0e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 08 五月 2021 13:45:34 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java
old mode 100644
new mode 100755
index 81f2b21..4b61709
--- a/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.java110.core.factory.WechatFactory;
import com.java110.dto.community.CommunityDto;
+import com.java110.dto.fee.BillDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerAppUserDto;
@@ -150,7 +151,12 @@
billOweFeeDto.setCurBill("T");
List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
- String url = sendMsgUrl + accessToken;
+ String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.SEND_TEMPLATE_URL);
+ if(StringUtil.isEmpty(sendTemplate)){
+ sendTemplate = sendMsgUrl;
+ }
+ 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);
Miniprogram miniprogram = null;
@@ -181,8 +187,8 @@
/*data.setFirst(new Content("鐗╀笟璐圭即璐规彁閱�"));*/
data.setFirst(new Content(fee.getFeeTypeName() + "鎻愰啋"));
data.setKeyword1(new Content(fee.getPayerObjName()));
- data.setKeyword2(new Content(DateUtil.dateTimeToDate(fee.getFeeEndTime()) + "鑷�" + DateUtil.dateTimeToDate(fee.getDeadlineTime())));
- data.setKeyword3(new Content(fee.getBillAmountOwed()));
+ data.setKeyword2(new Content(fee.getBillAmountOwed()));
+ data.setKeyword3(new Content(DateUtil.dateTimeToDate(fee.getFeeEndTime()) + "鑷�" + DateUtil.dateTimeToDate(fee.getDeadlineTime())));
data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
if (!StringUtil.isEmpty(oweUrl)) {
if (miniprogram == null) {
@@ -199,6 +205,13 @@
}
}
+ BillOweFeeDto tmpBillOweFeeDto = new BillOweFeeDto();
+ tmpBillOweFeeDto.setFeeId(fee.getFeeId());
+ tmpBillOweFeeDto.setCommunityId(fee.getCommunityId());
+ tmpBillOweFeeDto.setBillId(fee.getBillId());
+ tmpBillOweFeeDto.setState(BillOweFeeDto.STATE_SEND_OWNER);
+ feeInnerServiceSMOImpl.updateBillOweFees(tmpBillOweFeeDto);
+
}
}
}
--
Gitblit v1.8.0