diff --git a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java index 5e7d636..1fa0e51 100644 --- a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java +++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java @@ -132,7 +132,7 @@ public class FmOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { } @Override - public void updateComponentAccessTokent(String componentAccessToken, int expiresInSeconds) { + public void updateComponentAccessToken(String componentAccessToken, int expiresInSeconds) { try (Jedis jedis = this.jedisPool.getResource()) { jedis.setex(this.componentAccessTokenKey, expiresInSeconds - 200, componentAccessToken); logger.info("updateComponentVerifyTicketAccessToken " + componentAccessToken); diff --git a/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java b/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java index b8f5fe1..64fd509 100644 --- a/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java +++ b/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java @@ -57,7 +57,6 @@ public class UserUnionIdSchedule { List paidList = payOrderMapper.findListOfPaidOrderByDate(dateMap); paidList.parallelStream().forEach( payOrderVo -> { getUnionId(payOrderVo); - //sendUniformMessage(payOrderVo); }); } @@ -72,12 +71,12 @@ public class UserUnionIdSchedule { try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(payOrderVo.getAppId()); if(StringUtils.isNotBlank(payOrderVo.getTransactionId())) { - String openRet = openMaService.getApiGetPaidUnionid(payOrderVo.getOpenId(), payOrderVo.getTransactionId()); + String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), payOrderVo.getTransactionId(), null, null); logger.info(openRet); } else { WxPayAccount payAccount = payAccountMapper.selectByPrimaryKey(payOrderVo.getPayId()); if(payAccount != null) { - String openRet = openMaService.getApiGetPaidUnionid(payOrderVo.getOpenId(), payAccount.getMchId(), payOrderVo.getPayOrderNo()); + String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), null, payAccount.getMchId(), payOrderVo.getPayOrderNo()); logger.info(openRet); } } @@ -86,65 +85,4 @@ public class UserUnionIdSchedule { } } - - /** - * 根据payOrder发送模板消息 - * @param payOrderVo - */ - public void sendUniformMessage(WxPayOrderVo payOrderVo) { - if(StringUtils.isBlank(payOrderVo.getOpenId())) { - return; - } - - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - - // - // 卡券核销通知 p6pwzZN9GVJq11j2zh72EEhIn5fAIa6oQBBOjqVt8-U - // {{first.DATA}} - // 卡券类型:{{keyword1.DATA}} - // 卡券号码:{{keyword2.DATA}} - // 核销时间:{{keyword3.DATA}} - // {{remark.DATA}} - - // 审核结果通知 SxhGTL6AlcYtbc4nEYxcS4zoGRzTiUr9KEscvpEItQw - // {{first.DATA}} - // 审核状态:{{keyword1.DATA}} - // 活动名称:{{keyword2.DATA}} - // 活动时间:{{keyword3.DATA}} - // 活动地点:{{keyword4.DATA}} - // {{remark.DATA}} - // - // - String template_id = "p6pwzZN9GVJq11j2zh72EEhIn5fAIa6oQBBOjqVt8-U"; - WxMaUniformMessage.MiniProgram miniprogram = new WxMaUniformMessage.MiniProgram(); - miniprogram.setAppid(payOrderVo.getAppId()); - miniprogram.setPagePath("pages/index/index"); - miniprogram.setUsePath(true); - - WxMaUniformMessage templateMessage = WxMaUniformMessage.builder() - .isMpTemplateMsg(true) - .toUser(payOrderVo.getOpenId()) - .appid("wxed2f44705544b892") - .templateId(template_id) - .url("http://iformall.com") - .page("pages/index/index") - .formId(payOrderVo.getPrepayId()) // 微信支付的formId是prepayId - .miniProgram(miniprogram) - .data(Lists.newArrayList( - new WxMaTemplateData("first", payOrderVo.getAppId(), "#173177"), - new WxMaTemplateData("keyword1", payOrderVo.getOpenId(), "#173177"), - new WxMaTemplateData("keyword2", payOrderVo.getTransactionId(), "#173177"), - new WxMaTemplateData("keyword3", dateFormat.format(new Date()), "#173177") - )) - .emphasisKeyword("keyword1.DATA") - .build(); - WxMaService wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(payOrderVo.getAppId()); - - try { - wxMaService.getMsgService().sendUniformMsg(templateMessage); - } catch (WxErrorException e) { - logger.error("支付通知测试: " + e.getMessage()); - throw new MallinkException(ErrorCode.TEMPLATE_SEND_FAILED); - } - } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9a2023d..cf73d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,11 +23,11 @@ - 3.3.0.A - 3.3.0.A - 3.3.0.A - 3.3.0.A - 3.3.0.A + 3.4.0.A + 3.4.0.A + 3.4.0.A + 3.4.0.A + 3.4.0.A 2.3.0