| @@ -6,7 +6,8 @@ package com.iformall.enums; | |||||
| public enum EnumMerchantSubsidyType { | public enum EnumMerchantSubsidyType { | ||||
| MANUAL(1, "自主结算"), | MANUAL(1, "自主结算"), | ||||
| WECHAT(2, "微信结算"),; | |||||
| WECHAT(2, "微信结算"), | |||||
| DOUYIN(1, "抖音结算"),; | |||||
| public static EnumMerchantSubsidyType getEnum(Integer code) { | public static EnumMerchantSubsidyType getEnum(Integer code) { | ||||
| for (EnumMerchantSubsidyType value : values()) { | for (EnumMerchantSubsidyType value : values()) { | ||||
| @@ -45,4 +45,5 @@ public interface CUserServiceApapter { | |||||
| List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto, List<TenantEntity> tenantEntitys); | List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto, List<TenantEntity> tenantEntitys); | ||||
| void actionAfterLogin(CUser user); | |||||
| } | } | ||||
| @@ -245,6 +245,11 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return null; | return null; | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| } | |||||
| private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | ||||
| if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | ||||
| @@ -304,6 +304,11 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return ttCUserMapper.findCountHistory(tenantEntitys,dto); | return ttCUserMapper.findCountHistory(tenantEntitys,dto); | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| super.actionAfterLogin(user); | |||||
| } | |||||
| private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | ||||
| if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | ||||
| @@ -245,6 +245,11 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return null; | return null; | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| } | |||||
| private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| WxMaService wxMaService = null; | WxMaService wxMaService = null; | ||||
| if (isFmOpen) { | if (isFmOpen) { | ||||
| @@ -311,6 +311,11 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return wxCUserMapper.findCountHistory(tenantEntitys,dto); | return wxCUserMapper.findCountHistory(tenantEntitys,dto); | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| super.actionAfterLogin(user); | |||||
| } | |||||
| private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| WxMaService wxMaService = null; | WxMaService wxMaService = null; | ||||
| if (isFmOpen) { | if (isFmOpen) { | ||||
| @@ -50,7 +50,7 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService { | |||||
| logger.error("用户ID未找到: " + cUserId); | logger.error("用户ID未找到: " + cUserId); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户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 | if(wxCUserFrom.getFromType() != null | ||||
| && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER.getCode()) && wxCUserFrom.getFromId().equals(user.getId())) | && !(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()))){ | && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode()) && user.getUserId() != null && wxCUserFrom.getFromId().equals(user.getUserId()))){ | ||||
| @@ -25,7 +25,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ | |||||
| @Override | @Override | ||||
| public Integer getSubsidyType() { | public Integer getSubsidyType() { | ||||
| return EnumMerchantSubsidyType.MANUAL.getCode(); | |||||
| return EnumMerchantSubsidyType.DOUYIN.getCode(); | |||||
| } | } | ||||
| @Override | @Override | ||||