From 82bf98d1ff776a9262a46d6b40123e25579ec3bd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 20 Sep 2019 14:00:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E5=8F=91=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=9B=E5=BB=BA=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/DataInitController.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java index 1e54b9923..6cf21ce02 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -1,8 +1,9 @@ package com.iformall.controller.sys; -import com.alibaba.fastjson.JSON; import com.google.common.base.Function; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableListMultimap; +import com.google.common.collect.Multimaps; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; @@ -14,11 +15,13 @@ import com.iformall.enums.EnumUserType; import com.iformall.mapper.*; import com.iformall.service.WxCreditHistoryService; import com.iformall.utils.DateUtils; +import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.checkerframework.checker.nullness.qual.Nullable; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -67,6 +70,23 @@ public class DataInitController extends BaseController { private WxMerchantMapper wxMerchantMapper; + @PostMapping("/createMsgModel") + @ApiImplicitParam(name = "content", value = "content", dataType = "Long", paramType = "query", required = true) + public ResultData createMsgModel(String content) { + try { + MallUserInfo userInfo = getUser(); + if (userInfo.isFmSuperAdmin()) { + addMsgModel(content); + return new ResultData(); + } + } catch (Exception e) { + log.error("DataInitController::createMsgModel error ", e); + return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR, e.getMessage()); + } + + return new ResultData(); + } + @GetMapping("/init") public ResultData init() { try { @@ -344,6 +364,12 @@ public class DataInitController extends BaseController { }); } + @Transactional(rollbackFor = Exception.class) + public void addMsgModel(String context) { + IdWorker idWorker = IdWorker.get(); + addBirthDayMsgModelToMall(EnumMsgModel.COUPON_BIRTHDAY_OPENED, idWorker, context); + } + /** * 增加会员生日短信模板 */