From 4d166de4e93f5f035070afdbda8971d41d8a8d47 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 20 Sep 2023 14:15:00 +0800 Subject: [PATCH] //.. --- .../iformall/service/WxTemplateMsgService.java | 3 ++- .../service/impl/WxTemplateMsgServiceImpl.java | 4 ++-- .../UserDigitalAvatarOrderServiceImpl.java | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/service/WxTemplateMsgService.java b/suimangService/src/main/java/com/iformall/service/WxTemplateMsgService.java index ee3c84f..d5b8933 100644 --- a/suimangService/src/main/java/com/iformall/service/WxTemplateMsgService.java +++ b/suimangService/src/main/java/com/iformall/service/WxTemplateMsgService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.enums.EnumTemplateType; import java.util.List; import java.util.Map; @@ -63,5 +64,5 @@ public interface WxTemplateMsgService { PageInfo listAsPageForMiniApp(WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize); - void sendTemplateMsg(WxAppinfo appinfo, Long userId, String toPage, Map param); + void sendTemplateMsg(WxAppinfo appinfo, EnumTemplateType templateType, Long userId, String toPage, Map param); } diff --git a/suimangService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index dc9d8f7..d640365 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -123,9 +123,9 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { @Async @Override - public void sendTemplateMsg(WxAppinfo appinfo, Long userId, String toPage, Map param) { + public void sendTemplateMsg(WxAppinfo appinfo, EnumTemplateType templateType, Long userId, String toPage, Map param) { WxTemplateMsg templateMsgQ = new WxTemplateMsg(); - templateMsgQ.setType(EnumTemplateType.PHOTO_SUCCESS.getCode()); + templateMsgQ.setType(templateType.getCode()); templateMsgQ.setProjectType(appinfo.getProjectType()); templateMsgQ.setPlat(appinfo.getPlat()); templateMsgQ.setOnOff(EnumYesOrNo.YES.getCode()); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarOrderServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarOrderServiceImpl.java index edcb0b1..cc335b2 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarOrderServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarOrderServiceImpl.java @@ -320,17 +320,23 @@ public class UserDigitalAvatarOrderServiceImpl implements UserDigitalAvatarOrder if(!EnumDigitalAvatarOrderStatus.finish.getCode().equals(userDigitalAvatarOrder.getStatus())){ return; } - if(userDigitalAvatarOrder.getPlat() == null){ + Map param = new HashMap<>(); + if(EnumAppPlat.WX.getCode().equals(userDigitalAvatarOrder.getPlat())){ + param.put("thing1",userDigitalAvatarOrder.getTitle()); + param.put("character_string3",userDigitalAvatarOrder.getId().toString()); + param.put("time4", DateUtils.date2String(userDigitalAvatarOrder.getUpdateDate())); + }else if(EnumAppPlat.TOUTIAO.getCode().equals(userDigitalAvatarOrder.getPlat())){ + param.put("作品名称",userDigitalAvatarOrder.getTitle()); + param.put("任务名称",userDigitalAvatarOrder.getId().toString()); + param.put("完成时间", DateUtils.date2String(userDigitalAvatarOrder.getUpdateDate())); + }else{ + logger.error("订阅消息未获取到平台"+userDigitalAvatarOrder.getPlat()); return; } WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(EnumProject.PROJECT_5.getCode(), userDigitalAvatarOrder.getPlat()); String toPage = "/pages/lookPhoto/index?id="+userDigitalAvatarOrder.getId(); - Map param = new HashMap<>(); - param.put("thing1",userDigitalAvatarOrder.getTitle()); - param.put("character_string3",userDigitalAvatarOrder.getId().toString()); - param.put("time4", DateUtils.date2String(userDigitalAvatarOrder.getUpdateDate())); - wxTemplateMsgService.sendTemplateMsg(appinfo,userDigitalAvatarOrder.getUserId(),toPage,param); + wxTemplateMsgService.sendTemplateMsg(appinfo,EnumTemplateType.PHOTO_SUCCESS,userDigitalAvatarOrder.getUserId(),toPage,param); } @Override