diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java index f9c6eebd..c7d79f33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.UserGreet; import com.ruoyi.cai.dto.admin.query.BatchAuditReq; import com.ruoyi.cai.dto.admin.vo.UserGreetAdminVo; +import com.ruoyi.cai.enums.AuditStatusEnum; import com.ruoyi.cai.service.UserGreetService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -68,7 +69,7 @@ public class UserGreetController extends BaseController { userGreetService.update(Wrappers.lambdaUpdate(UserGreet.class) .in(UserGreet::getId,bo.getIds()) .set(UserGreet::getAuditStatus,bo.getAuditStatus()) - .eq(UserGreet::getAuditStatus,1)); + .eq(UserGreet::getAuditStatus, AuditStatusEnum.AUDITING.getCode())); return R.ok(); } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java index c50cb613..25b2cafa 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java @@ -1,6 +1,7 @@ package com.ruoyi.test.business; import com.alibaba.fastjson2.JSON; +import com.ruoyi.cai.auth.CaiLoginManager; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserCount; import com.ruoyi.cai.im.ImManager; @@ -34,6 +35,14 @@ public class UserTest { private DynamicService dynamicService; @Autowired private AwardManager awardManager; + @Autowired + private CaiLoginManager caiLoginManager; + + @Test + public void caiLoginManager(){ + User user = userService.getByUserCode("1389"); + caiLoginManager.dealInviteId(user,"1366",false); + } @Test public void joinAnchorInvite(){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java index ef6f30a0..812897c4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java @@ -213,8 +213,8 @@ public class CaiLoginManager { log.info("邀请人没有工会,无法入会 inviteUserCode={}",inviteUserCode); return; } - UnionUser checkUnionUser = unionUserService.getByUserId(user.getId()); - if(checkUnionUser != null){ + UnionUser checkUnionUser = unionUserService.getByUserIdAndUnionId(user.getId(),union.getId()); + if(checkUnionUser == null){ UnionUser unionUser = new UnionUser(); unionUser.setUnionId(union.getId()); unionUser.setUnionUserId(union.getUserId()); @@ -223,6 +223,7 @@ public class CaiLoginManager { unionUser.setGiftDivide(systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.DEFAULT_UNION_VIDEO_INCOME_RATE)); unionUser.setVipDivide(BigDecimal.ZERO); unionUser.setEnableRate(true); + unionUser.setCreateTime(LocalDateTime.now()); unionUserService.save(unionUser); } }finally { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/config/AliSmsProperties.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/config/AliSmsProperties.java index ed14c5c5..40c2cea3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/config/AliSmsProperties.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/config/AliSmsProperties.java @@ -8,7 +8,10 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "ali.sms") public class AliSmsProperties { - private String accessKeyId = "LTAI5tRf2jUyoYmAC9kw4AMF"; - private String accessKeySecret = "frvNLpySKxC38eihnWKi3NMFZSume3"; - private String signName = "武汉康慧创欣科技"; +// private String accessKeyId = "LTAI5tRf2jUyoYmAC9kw4AMF"; +// private String accessKeySecret = "frvNLpySKxC38eihnWKi3NMFZSume3"; +// private String signName = "武汉康慧创欣科技"; + private String accessKeyId = "LTAI5tNyNSJWXqBVNamiKfWZ"; + private String accessKeySecret = "xyEwLbbpePsG6NUUnKzRPxaXY1wzTo"; + private String signName = "深圳市馨曼琳网络科技"; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/CodeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/CodeEnum.java index 85af24e0..b212450a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/CodeEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/CodeEnum.java @@ -2,11 +2,14 @@ package com.ruoyi.cai.enums; import lombok.Getter; +/** + * 以前的 SMS_294195165 + */ @Getter public enum CodeEnum { - REGISTER("注册短信","SMS_294195165"), - RESET_PASSWORD("重置密码","SMS_294195165"), - RESET_ADOLESCENT("重置青少年模式密码","SMS_294195165"), + REGISTER("注册短信","SMS_465635333"), + RESET_PASSWORD("重置密码","SMS_465635333"), + RESET_ADOLESCENT("重置青少年模式密码","SMS_465635333"), ; private final String name; private final String aliTemplate; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java index e6b72403..eb942380 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java @@ -137,7 +137,7 @@ public class AliSmsKit { AliSmsProperties config = new AliSmsProperties(); messageSenderUtil.setConfig(config); messageSenderUtil.init(); - messageSenderUtil.batchSendMessagePublic(Arrays.asList("15302786929"), CodeEnum.REGISTER.getAliTemplate()); + messageSenderUtil.sendMessage("15302786929", CodeEnum.REGISTER.getAliTemplate(),"778890"); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java index 180a35fa..10ec104a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java @@ -57,7 +57,7 @@ public class PayConfigManager { List values = payConfigService.listOkByPayType(PayTypeEnum.ALI); Map using = new HashMap<>(); for (PayConfig value : values) { - using.put(value.getWxMcid(),value); + using.put(value.getAppid(),value); } if(using.isEmpty()){ return null; @@ -66,7 +66,8 @@ public class PayConfigManager { List totals = payTotalService.listByAliAppId(wxMcidSet); List payIds = totals.stream() .sorted(Comparator.comparing(PayTotal::getMoney)) - .map(PayTotal::getPayId).collect(Collectors.toList()); + .map(PayTotal::getPayId) + .collect(Collectors.toList()); for (String wxMcid : wxMcidSet) { if(!payIds.contains(wxMcid)){ return using.get(wxMcid); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java index f925e5b3..e7c8619c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java @@ -19,6 +19,8 @@ public interface UnionUserService extends IService { UnionUser getByUserId(Long userId); + UnionUser getByUserIdAndUnionId(Long userId,Long unionId); + Page pageAdmin(PageQuery pageQuery, UnionUserAdminVo bo); List countByUnionIds(List unionIds); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java index 860bb0c1..acadac7e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java @@ -30,6 +30,14 @@ public class UnionUserServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, UnionUserAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo);