优化公众号费用通知

java110-utils/src/main/java/com/java110/utils/cache/CommonCache.java

@@ -7,6 +7,7 @@ import redis.clients.jedis.Jedis;
  */
 public class CommonCache extends BaseCache {
 
+
     public final static int defaultExpireTime = 5 * 60;
 
     /**

java110-utils/src/main/java/com/java110/utils/constant/WechatConstant.java

@@ -13,6 +13,8 @@ public class WechatConstant {
     //微信域
     public static final String WECHAT_DOMAIN = "WECHAT";
 
+    public static final String KEY_PROPERTY_FEE_TEMPLATE_ID = "PROPERTY_FEE_TEMPLATE_ID";
+
     public static final String TOKEN = "TOKEN";
     public static final String WELCOME = "WELCOME";
     public static final String DEFAULT_WELCOME = "HC小区物业管理系统是由java110团队于2017年4月份发起的前后端分离、分布式架构开源项目，目前我们的代码开源在github 和gitee上，开源项目由HC小区管理系统后端，HC小区管理系统前端，HC小区管理系统业主手机版和HC小区管理系统物业手机版，业务技术交流群：827669685";

service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java

@@ -13,6 +13,9 @@ import com.java110.entity.wechat.Content;
 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.stereotype.Component;
 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 @@ import java.util.*;
  * @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 @@ public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz{
     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 @@ public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz{
         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 @@ public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz{
                     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);
                 }
             }