irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
admin
2024-08-19 19:40:37 +08:00
parent 6eeca40527 8ced591cac
commit 82e8f33c3f
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
View File

@@ -40,6 +40,7 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.ConvertUtil;
import com.starry.common.utils.VerificationCodeUtils; import com.starry.common.utils.VerificationCodeUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -191,6 +192,7 @@ public class WxClerkController {
@ClerkUserLogin @ClerkUserLogin
@PostMapping("/user/add") @PostMapping("/user/add")
@Transactional(rollbackFor = Exception.class)
public R userAdd(@Validated @RequestBody PlayClerkUserByWxAddVo vo) { public R userAdd(@Validated @RequestBody PlayClerkUserByWxAddVo vo) {
String clerkId = ThreadLocalRequestDetail.getClerkUserInfo().getId(); String clerkId = ThreadLocalRequestDetail.getClerkUserInfo().getId();
PlayClerkUserInfoEntity userInfo = playClerkUserInfoService.selectById(clerkId); PlayClerkUserInfoEntity userInfo = playClerkUserInfoService.selectById(clerkId);
@@ -211,14 +213,7 @@ public class WxClerkController {
entity.setClerkId(clerkId); entity.setClerkId(clerkId);
entity.setAddTime(LocalDateTime.now()); entity.setAddTime(LocalDateTime.now());
playClerkUserReviewInfoService.create(entity); playClerkUserReviewInfoService.create(entity);
wxCustomMpService.sendClerkApplyNoticeForAdmin(userInfo); wxCustomMpService.sendClerkApplyNoticeForAdmin(entity, userInfo.getTenantId());
return R.ok("申请成功");
}
@PostMapping("/user/add/test")
public R test() {
PlayClerkUserInfoEntity userInfo = playClerkUserInfoService.selectById("ILbjarTt");
wxCustomMpService.sendClerkApplyNoticeForAdmin(userInfo);
return R.ok("申请成功"); return R.ok("申请成功");
} }

4
play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
View File

@@ -227,8 +227,8 @@ public class WxCustomMpService {
} }
public void sendClerkApplyNoticeForAdmin(PlayClerkUserInfoEntity entity) { public void sendClerkApplyNoticeForAdmin(PlayClerkUserReviewInfoEntity entity, String tenantId) {
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(entity.getTenantId()); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId);
String template_id = tenant.getRzsqAdminTemplateId(); String template_id = tenant.getRzsqAdminTemplateId();
String tenantKey = tenant.getTenantKey(); String tenantKey = tenant.getTenantKey();
String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/admin/clerk-apply-list"; String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/admin/clerk-apply-list";