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

更改bug

Browse Source
This commit is contained in:
liuyingfang
2024-02-27 20:40:00 +08:00
parent c4be42c23a
commit 3be14a7a7c
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java
View File

@@ -3,6 +3,7 @@ package com.chaozhanggui.admin.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chaozhanggui.admin.system.service.MerchantChannelStatusService; import com.chaozhanggui.admin.system.service.MerchantChannelStatusService;
import com.chaozhanggui.common.system.config.RespBody; import com.chaozhanggui.common.system.config.RespBody;
import com.chaozhanggui.merchant.entity.ys.YsConfig;
import com.chaozhanggui.merchant.service.MerchantService; import com.chaozhanggui.merchant.service.MerchantService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -187,7 +188,6 @@ public class MerchantChannelStatusController {
public RespBody messageChannel(@PathVariable("userId") Integer userId){ public RespBody messageChannel(@PathVariable("userId") Integer userId){
return merchantChannelStatusService.messageChannel(userId); return merchantChannelStatusService.messageChannel(userId);
} }
/** /**
* ip记录 * ip记录
* @param userId * @param userId

3
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
View File

@@ -245,6 +245,9 @@ public class MerchantChannelStatusService {
d0.put("channel",channelD0.get(0).getChannel()); d0.put("channel",channelD0.get(0).getChannel());
d0.put("valid",account == null? null:account.getChanneltype()); d0.put("valid",account == null? null:account.getChanneltype());
d0.put("thirdStatus",channelD0.get(0).getThirdstatus()); d0.put("thirdStatus",channelD0.get(0).getThirdstatus());
d0.put("wxLiteAppId","");
d0.put("wxPubAppId","");
d0.put("wxPubPath","");
merchantChannelMessage.add(d0); merchantChannelMessage.add(d0);
} }

1
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/TokenUtil.java
View File

@@ -39,6 +39,7 @@ public class TokenUtil {
return generateToken(claims); return generateToken(claims);
} }
/** /**
* 生成token * 生成token
* @param claims * @param claims

2
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java
View File

@@ -458,7 +458,7 @@ public class YSAuditServiceV3 {
mcs.setApplicationid(extra.getString("sysFlowId")); mcs.setApplicationid(extra.getString("sysFlowId"));
mcs.setThirdstatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING); mcs.setThirdstatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING);
mcs.setInterfaceversion(INTERFACE_VERSION); mcs.setInterfaceversion(INTERFACE_VERSION);
merchantChannelStatusMapper.updateByPrimaryKey(mcs); merchantChannelStatusMapper.updateByPrimaryKeySelective(mcs);
} }