IC卡资金异动提醒修改

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/mapper/IcCardMapper.java

@@ -15,5 +15,5 @@ public interface IcCardMapper {
 
     SysSchoolDTO getSchoolIdByName(@Param("name") String name);
 
-    String selectTemplateId(@Param("schoolId") Long schoolId);
+    String selectTemplateId(@Param("schoolId") Long schoolId, @Param("code") String code);
 }

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/IcCardServiceImpl.java

@@ -33,16 +33,13 @@ import java.util.List;
 @Service
 public class IcCardServiceImpl implements IcCardService {
 
-    @Autowired
-    private RestTemplate restTemplate;
-
     @Autowired
     private IcCardMapper icCardMapper;
 
     @Autowired
     private WechatApi wechatApi;
 
-    private Logger logger = LoggerFactory.getLogger(AccessControlServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccessControlServiceImpl.class);
 
     @Value("${smartschool.wechat.pushUrl}")
     private String targetURL;
@@ -57,7 +54,7 @@ public class IcCardServiceImpl implements IcCardService {
             String templateId = icCardMapper.selectTemplateId(schoolId, NoticeTemplate.MONEY_NOTICE.getCode());
             if(!StringUtils.hasText(templateId)){
                 logger.error("学校[{}] 模板[{}]未设置",schoolId,NoticeTemplate.MONEY_NOTICE.getCode());
-                return "";
+                return null;
             }
             StringBuilder sb = new StringBuilder();
             accTransDetailList.forEach(accTransDetail -> {
@@ -72,7 +69,6 @@ public class IcCardServiceImpl implements IcCardService {
                     messageInfo.setTouser(openId);
                     messageInfo.setAppId(appId);
                     messageInfo.setSecret(secret);
-                    //messageInfo.setUserType(2);
                     messageInfo.setTemplateId(templateId);
                     String accNo = accTransDetail.getAccNo();
                     String cardNo = StringUtils.isEmpty(accNo) ? null : accNo.substring(accTransDetail.getAccNo().length() - 4);
@@ -80,7 +76,7 @@ public class IcCardServiceImpl implements IcCardService {
                     messageInfo.setTitle(header);
                     Date accTransDay = accTransDetail.getAccTransDay();
                     if (null != accTransDay) {
-                        messageInfo.setKeyword1(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(accTransDetail.getAccTransDay()));
+                        messageInfo.setKeyword1(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accTransDetail.getAccTransDay()));
                     }
                     if (Integer.parseInt(oldType) > 15) {
                         messageInfo.setKeyword2(String.format("%.2f", accTransDetail.getoMoneyValue()));
@@ -89,8 +85,10 @@ public class IcCardServiceImpl implements IcCardService {
                     }
                     messageInfo.setKeyword3(accTransDetail.getAccTransType());
                     messageInfo.setKeyword4(String.format("%.2f", accTransDetail.getCardMoneyValue()));
-                    messageInfo.setRemark("感谢您使用");
+                    messageInfo.setRemark("感谢您使用!");
                     messageInfoList.add(messageInfo);
+                }else {
+                    logger.info("GUID={}未找到对应的推送人", accTransDetail.getGuid());
                 }
 
             });

applications/device/device-server/src/main/resources/mapper/IcCardMapper.xml

@@ -19,6 +19,6 @@
   </select>
 
   <select id="selectTemplateId" resultType="string">
-    SELECT st_templateid FROM school_template WHERE ST_SCHOOLID = #{schoolId} and st_code = 'iccard'
+    SELECT st_templateid FROM school_template WHERE ST_SCHOOLID = #{schoolId} and st_code = #{code}
   </select>
 </mapper>

applications/school/school-dto/src/main/java/com/usoftchina/smartschool/school/enums/NoticeTemplate.java

@@ -10,7 +10,7 @@ public enum NoticeTemplate {
     SCORE_NOTICE("score", "成绩通知"),
     UNAUDIT_NOTICE("unAudit", "待审批通知"),
     MEETING_NOTICE("meeting", "会议提醒"),
-    MONEY_NOTICE("money", "资金异动提醒");
+    MONEY_NOTICE("iccard", "资金异动提醒");
 
     private String code;