czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

Browse Source
This commit is contained in:
liuyingfang
2023-06-17 16:50:13 +08:00
parent 51537d9421 1efdf1a3f6
commit 2cb6f7de9a
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java
View File

@@ -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

5
pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/HtmlUtil.java
View File

@@ -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");