From 2f2aa321ebaca83a840198b04b7afc718d042c8c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 六月 2020 16:03:20 +0800
Subject: [PATCH] 优化公众号费用通知

---
 service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 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
index ca35536..a9cdd0d 100644
--- 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
@@ -13,6 +13,9 @@
 import com.java110.entity.wechat.Data;
 import com.java110.entity.wechat.PropertyFeeTemplateMessage;
 import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,10 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @program: MicroCommunity
@@ -30,7 +36,7 @@
  * @create: 2020-06-15 13:35
  **/
 @Component
-public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz{
+public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz {
 
     private static Logger logger = LoggerFactory.getLogger(PublicWeChatPushMessageTemplate.class);
 
@@ -50,45 +56,48 @@
     private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
 
     //妯℃澘id
-    private static String templateId = "ZF4j_ug2XW-UGwW1F-Gi4M1-51lpiu-PM89Oa6oZv6w";
-
+    private static String DEFAULT_TEMPLATE_ID = "ZF4j_ug2XW-UGwW1F-Gi4M1-51lpiu-PM89Oa6oZv6w";
 
 
     @Override
     protected void process(TaskDto taskDto) throws Exception {
         logger.debug("寮�濮嬫墽琛屽井淇℃ā鏉夸俊鎭帹閫�" + taskDto.toString());
 
+        String templateId = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.KEY_PROPERTY_FEE_TEMPLATE_ID);
+
+        templateId = StringUtil.isEmpty(templateId) ? DEFAULT_TEMPLATE_ID : templateId;
+
         //鏌ヨ鍏紬鍙烽厤缃�
         SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
         smallWeChatDto.setWeChatType("1100");
         List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
 
-        if(smallWeChatDtos.size() <=0 || smallWeChatDto == null){
+        if (smallWeChatDtos.size() <= 0 || smallWeChatDto == null) {
             logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
             return;
         }
 
         SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
-        String accessToken =  WechatFactory.getAccessToken(weChatDto.getAppId(),weChatDto.getAppSecret());
+        String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
 
-        if(accessToken == null || accessToken == ""){
-            logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}",accessToken);
+        if (accessToken == null || accessToken == "") {
+            logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
             return;
         }
 
         //鏍规嵁灏忓尯id鏌ヨ涓氫富涓庡叕浼楀彿缁戝畾淇℃伅
         OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
         ownerAppUserDto.setCommunityId(weChatDto.getObjId());
-        ownerAppUserDto.setAppType("WECHAT");
-        List<OwnerAppUserDto>  ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+        ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
 
-        if(ownerAppUserDtos.size() <=0 || ownerAppUserDtos == null){
+        if (ownerAppUserDtos.size() <= 0 || ownerAppUserDtos == null) {
             logger.info("鏈煡璇㈠埌涓氫富涓庡井淇″叕浼楀彿缁戝畾鍏崇郴");
             return;
         }
 
         List<String> memberIdList = new ArrayList<>(ownerAppUserDtos.size());
-        for(OwnerAppUserDto appUserDto :ownerAppUserDtos ){
+        for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
             memberIdList.add(appUserDto.getMemberId());
         }
 
@@ -101,9 +110,9 @@
         List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
 
         String url = sendMsgUrl + accessToken;
-        for( BillOweFeeDto fee : billOweFeeDtos){
-            for(OwnerAppUserDto appUserDto :ownerAppUserDtos ){
-                if(fee.getOwnerId().equals(appUserDto.getMemberId())){
+        for (BillOweFeeDto fee : billOweFeeDtos) {
+            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);
@@ -115,13 +124,13 @@
                     templateMessage.setTouser(appUserDto.getOpenId());
                     data.setFirst(new Content("鐗╀笟璐圭即璐规彁閱�"));
                     data.setKeyword1(new Content(fee.getPayerObjName()));
-                    data.setKeyword2(new Content(year+"骞�-"+month+"鏈�"));
+                    data.setKeyword2(new Content(year + "骞�-" + month + "鏈�"));
                     data.setKeyword3(new Content(fee.getAmountOwed()));
                     data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
                     templateMessage.setData(data);
                     logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
                     ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
-                    logger.info("寰俊妯℃澘杩斿洖鍐呭:{}",responseEntity);
+                    logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
                 }
             }
 

--
Gitblit v1.8.0