diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumAppType.java b/mallinkService/src/main/java/com/iformall/enums/EnumAppType.java index 7ddfe2a63..7a3deafc3 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumAppType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumAppType.java @@ -5,10 +5,12 @@ package com.iformall.enums; */ public enum EnumAppType { - // 1-B端, 2-C端 + // 1-B端, 2-C端, 3-服务号, 4-订阅号 B(1, "B端"), - C(2, "C端") + C(2, "C端"), + MP_S(3,"公众号-服务号"), + MP_P(4, "公众号-订阅号"), ; public static EnumAppType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index 753cf6ac0..e0a960f11 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -8,7 +8,8 @@ public enum EnumTemplateType { // 1-核销成功消息, 2-核销失败消息 VERIFY_SUCCESS(1, "核销成功消息"), - VERIFY_FAIL(2, "核销失败消息") + VERIFY_FAIL(2, "核销失败消息"), + AUDIT_MESSAGE(3, "审核结果通知") ; public static EnumTemplateType getEnum(Integer code) { diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java index 6b54a521f..5f542e67a 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java @@ -5,9 +5,7 @@ import com.google.gson.GsonBuilder; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; -import com.iformall.enums.EnumWeappAuditStatus; -import com.iformall.enums.EnumWxAuthorizationInfoType; -import com.iformall.enums.EnumWxAuthorizationStatus; +import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.wechat.WxOpenService; import io.swagger.annotations.Api; @@ -35,6 +33,7 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; @Controller @RequestMapping("/wxOpen") @@ -294,6 +293,15 @@ public class WechatCalllbackController extends BaseController { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 StringBuilder titleSB = new StringBuilder(); + if(appinfo.getType().equals(EnumAppType.C.getCode())) { + titleSB.append("C端小程序"); + } else if(appinfo.getType().equals(EnumAppType.B.getCode())) { + titleSB.append("B端小程序"); + } else if(appinfo.getType().equals(EnumAppType.MP_S.getCode())) { + titleSB.append("公众号-服务号"); + } else if(appinfo.getType().equals(EnumAppType.MP_P.getCode())) { + titleSB.append("公众号-订阅号"); + } titleSB.append(appinfo.getName()); if(success) { titleSB.append("审核通过");