diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java b/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java index 9db517f..cc8e985 100644 --- a/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java +++ b/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java @@ -1,13 +1,18 @@ package cn.pluss.platform; +import cn.pluss.platform.klk.util.HtmlUtil; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; @MapperScan("cn.pluss.platform.mapper") @@ -26,4 +31,12 @@ public class ManageApplication extends SpringBootServletInitializer { return builder.sources(ManageApplication.class); } + + @Bean + public CommandLineRunner commandLineRunner(ApplicationContext ctx) { + return (args) -> { + logger.info("=========================启动完成=========================="); + ctx.getBean(HtmlUtil.class).initHtml(); + }; + } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java index 169391a..645aa55 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java @@ -311,7 +311,7 @@ public class LaKalaInterfaceImpl { data.put("contactManName", userBrakCard.getPhone()); data.put("channelType", ObjectUtils.isEmpty(mccReflect) ? "7399" : mccReflect.getMccCode()); data.put("phone", userBrakCard.getPhone()); - data.put("agencyName", merchantBaseInfo.getBussAuthNum()); + data.put("agencyName", merchantBaseInfo.getMerchantName()); // //协议 AttchmentsVo agree_ment = new AttchmentsVo(); //图片set diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/HtmlUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/HtmlUtil.java index cd36393..2b427d5 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/HtmlUtil.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/HtmlUtil.java @@ -27,8 +27,9 @@ public class HtmlUtil { @Autowired FreeMarkerConfigurer freeMarkerConfigurer; static Template template =null; - @Bean - public void initHtml(){ + + + public void initHtml(){ try { template = freeMarkerConfigurer.getConfiguration().getTemplate("indexHTKWECHAT_PAY.html");