diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index e0a960f..3dd6b1a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -9,7 +9,8 @@ public enum EnumTemplateType { VERIFY_SUCCESS(1, "核销成功消息"), VERIFY_FAIL(2, "核销失败消息"), - AUDIT_MESSAGE(3, "审核结果通知") + AUDIT_MESSAGE(3, "审核结果通知"), + PRESS_SUCCESS(4,"砍价成功消息") ; public static EnumTemplateType getEnum(Integer code) { diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java index 9a2011e..7b0ac2f 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java @@ -72,7 +72,7 @@ public class WechatWeappMsgTemplateController { @GetMapping("getTemplateLibraryKeywordList") @ApiImplicitParams({ @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true), - @ApiImplicitParam(name = "id", value = "页数", dataType = "String", paramType = "query", required = true)}) + @ApiImplicitParam(name = "id", value = "模板标题id", dataType = "String", paramType = "query", required = true)}) public ResultData findTemplateLibraryKeywordList(String appId, String id) { try { WxMaService maService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 9f13a7b..ac06599 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -259,6 +259,7 @@ public class WxWeappInfoController extends BaseController { // 核销成功消息 JSONObject verify_success = templeObj.getJSONObject("verify_success"); JSONArray keyidlist = verify_success.getJSONArray("keyword_id_list"); + String customParam = verify_success.getString("custom_param"); List keyArr = getIdList(keyidlist); WxMaTemplateAddResult ret = maService.getTemplateService().addTemplate(verify_success.getString("id"), keyArr); logger.info(ret.toString()); @@ -270,15 +271,18 @@ public class WxWeappInfoController extends BaseController { WxTemplateMsg templateMsg = templateMsgService.getByObj(templateMsgQ); if(templateMsg != null) { templateMsg.setTemplateId(ret.getTemplateId()); + templateMsg.setCustomParam(customParam); templateMsgService.saveOrUpdate(templateMsg); } else { templateMsgQ.setTemplateId(ret.getTemplateId()); + templateMsg.setCustomParam(customParam); templateMsgService.saveOrUpdate(templateMsgQ); } } // 核销失败消息 JSONObject verify_fail = templeObj.getJSONObject("verify_fail"); keyidlist = verify_fail.getJSONArray("keyword_id_list"); + customParam = verify_success.getString("custom_param"); List keyArr1 = getIdList(keyidlist); ret = maService.getTemplateService().addTemplate(verify_fail.getString("id"), keyArr1); logger.info(ret.toString()); @@ -290,9 +294,35 @@ public class WxWeappInfoController extends BaseController { WxTemplateMsg templateMsg = templateMsgService.getByObj(templateMsgQ); if(templateMsg != null) { templateMsg.setTemplateId(ret.getTemplateId()); + templateMsg.setCustomParam(customParam); templateMsgService.saveOrUpdate(templateMsg); } else { templateMsgQ.setTemplateId(ret.getTemplateId()); + templateMsg.setCustomParam(customParam); + templateMsgService.saveOrUpdate(templateMsgQ); + } + } + + // 砍价成功消息 + JSONObject press_success = templeObj.getJSONObject("press_success"); + keyidlist = verify_fail.getJSONArray("keyword_id_list"); + customParam = verify_success.getString("custom_param"); + List keyArr2 = getIdList(keyidlist); + ret = maService.getTemplateService().addTemplate(press_success.getString("id"), keyArr2); + logger.info(ret.toString()); + if(appinfo != null) { + // wx_template_msg + WxTemplateMsg templateMsgQ = new WxTemplateMsg(); + templateMsgQ.setTenantId(appinfo.getTenantId()); + templateMsgQ.setType(EnumTemplateType.PRESS_SUCCESS.getCode()); + WxTemplateMsg templateMsg = templateMsgService.getByObj(templateMsgQ); + if(templateMsg != null) { + templateMsg.setTemplateId(ret.getTemplateId()); + templateMsg.setCustomParam(customParam); + templateMsgService.saveOrUpdate(templateMsg); + } else { + templateMsgQ.setTemplateId(ret.getTemplateId()); + templateMsg.setCustomParam(customParam); templateMsgService.saveOrUpdate(templateMsgQ); } }