diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java index 93a723fc8..9c6fdba54 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java @@ -6,7 +6,8 @@ package com.iformall.enums; public enum EnumMerchantSubsidyType { MANUAL(1, "自主结算"), - WECHAT(2, "微信结算"),; + WECHAT(2, "微信结算"), + DOUYIN(1, "抖音结算"),; public static EnumMerchantSubsidyType getEnum(Integer code) { for (EnumMerchantSubsidyType value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java index 1ea40849f..8afdc0d2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java @@ -45,4 +45,5 @@ public interface CUserServiceApapter { List findCountHistory(WxCUserBasicInfoDto dto, List tenantEntitys); + void actionAfterLogin(CUser user); } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java index 3fef32892..7a927d71e 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java @@ -245,6 +245,11 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer return null; } + @Override + public void actionAfterLogin(CUser user) { + + } + private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index c21914a9c..ca829d55c 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -304,6 +304,11 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer return ttCUserMapper.findCountHistory(tenantEntitys,dto); } + @Override + public void actionAfterLogin(CUser user) { + super.actionAfterLogin(user); + } + private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java index 7bb65b7f5..38d15d2b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java @@ -245,6 +245,11 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer return null; } + @Override + public void actionAfterLogin(CUser user) { + + } + private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { WxMaService wxMaService = null; if (isFmOpen) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index 75086edc3..b8b6055af 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -311,6 +311,11 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer return wxCUserMapper.findCountHistory(tenantEntitys,dto); } + @Override + public void actionAfterLogin(CUser user) { + super.actionAfterLogin(user); + } + private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { WxMaService wxMaService = null; if (isFmOpen) { diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java index 4fdf0e0e2..e490c543d 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java @@ -50,7 +50,7 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService { logger.error("用户ID未找到: " + cUserId); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + cUserId); } - basicCUserService.actionAfterLogin(user); + cuserFactory.getCUserService(EnumAppPlat.getByCode(wxCUserFrom.getPlat())).actionAfterLogin(user); if(wxCUserFrom.getFromType() != null && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER.getCode()) && wxCUserFrom.getFromId().equals(user.getId())) && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode()) && user.getUserId() != null && wxCUserFrom.getFromId().equals(user.getUserId()))){ diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index aaab59e41..9fc307c48 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -25,7 +25,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ @Override public Integer getSubsidyType() { - return EnumMerchantSubsidyType.MANUAL.getCode(); + return EnumMerchantSubsidyType.DOUYIN.getCode(); } @Override