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 | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 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 27e6c6b..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
@@ -2,20 +2,27 @@
import com.alibaba.fastjson.JSON;
import com.java110.core.factory.WechatFactory;
-import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-import com.java110.core.smo.smallWechatAttr.ISmallWechatAttrInnerServiceSMO;
-import com.java110.core.smo.store.ISmallWeChatInnerServiceSMO;
-import com.java110.core.smo.user.IOwnerAppUserInnerServiceSMO;
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;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
import com.java110.dto.task.TaskDto;
import com.java110.entity.wechat.Content;
import com.java110.entity.wechat.Data;
+import com.java110.entity.wechat.Miniprogram;
import com.java110.entity.wechat.PropertyFeeTemplateMessage;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
+import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -114,7 +121,7 @@
String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
- if (accessToken == null || accessToken == "") {
+ if (StringUtil.isEmpty(accessToken)) {
logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
@@ -141,26 +148,56 @@
billOweFeeDto.setCommunityId(weChatDto.getObjId());
billOweFeeDto.setOwnerIds(memberIds);
billOweFeeDto.setState("1000");
+ 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;
+ if (oweRoomUrl.contains("@@")) {
+ miniprogram = new Miniprogram();
+ miniprogram.setAppid(oweRoomUrl.split("@@")[0]);
+ }
+ //杞﹁締璐圭敤
+ if (oweCarUrl.contains("@@")) {
+ miniprogram = new Miniprogram();
+ miniprogram.setAppid(oweCarUrl.split("@@")[0]);
+ }
+
+ String oweUrl = "";
for (BillOweFeeDto fee : billOweFeeDtos) {
+ oweUrl = FeeDto.PAYER_OBJ_TYPE_ROOM.equals(fee.getPayerObjType()) ? oweRoomUrl : oweCarUrl;
for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
if (fee.getOwnerId().equals(appUserDto.getMemberId())) {
Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(fee.getFeeEndTime());
Calendar now = Calendar.getInstance();
now.setTime(date);
- int year = now.get(Calendar.YEAR);
- int month = now.get(Calendar.MONTH);
+// int year = now.get(Calendar.YEAR);
+// int month = now.get(Calendar.MONTH);
Data data = new Data();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(appUserDto.getOpenId());
- data.setFirst(new Content("鐗╀笟璐圭即璐规彁閱�"));
+ /*data.setFirst(new Content("鐗╀笟璐圭即璐规彁閱�"));*/
+ data.setFirst(new Content(fee.getFeeTypeName() + "鎻愰啋"));
data.setKeyword1(new Content(fee.getPayerObjName()));
- data.setKeyword2(new Content(year + "骞�-" + month + "鏈�"));
- data.setKeyword3(new Content(fee.getAmountOwed()));
+ 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) {
+ templateMessage.setUrl(oweUrl + fee.getPayObjId() + "&wAppId=" + weChatDto.getAppId());
+ } else {
+ miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId() + "&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);
@@ -168,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