ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

Browse Source
This commit is contained in:
furongxin 2024-11-15 17:05:49 +08:00
commit dfce290155
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/dto/SubscribeMessageReqDTO.java
View File

@ -1,8 +1,6 @@
package cn.iocoder.yudao.module.system.api.subscribe.dto; package cn.iocoder.yudao.module.system.api.subscribe.dto;
import com.sun.org.apache.xpath.internal.operations.Bool;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -17,7 +15,6 @@ import java.util.List;
*/ */
@Schema(description = "RPC 服务 - 微信小程序订阅消息 Request DTO") @Schema(description = "RPC 服务 - 微信小程序订阅消息 Request DTO")
@Data @Data
@Builder
public class SubscribeMessageReqDTO { public class SubscribeMessageReqDTO {
@Schema(description = "接收者（用户）的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "o3bwX6Yw1bvbMAV-jUNjHrbrJu0I") @Schema(description = "接收者（用户）的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "o3bwX6Yw1bvbMAV-jUNjHrbrJu0I")
@ -44,6 +41,6 @@ public class SubscribeMessageReqDTO {
} }
@Schema(description = "模版类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1:小程序模版：2：公众号模版") @Schema(description = "模版类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1:小程序模版：2：公众号模版")
@Builder.Default @NotNull(message = "模版类型不能为空")
private String minOrMpType = "1" ; private String minOrMpType = "1" ;
} }

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java
View File

@ -38,9 +38,9 @@ public class SubscribeMessageSendApiImpl implements SubscribeMessageSendApi {
//发送审批结果通知 //发送审批结果通知
String type = reqDTO.getMinOrMpType() ; String type = reqDTO.getMinOrMpType() ;
if( type == null || type.equals("1") ) { if( type == null || type.equals("1") ) {
socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ;
} else {
socialClientService.getWxMaService().getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO)); socialClientService.getWxMaService().getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO));
} else {
socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ;
} }
return success(1L); return success(1L);
} }
@ -51,9 +51,10 @@ public class SubscribeMessageSendApiImpl implements SubscribeMessageSendApi {
//发送OA流程待办提醒 //发送OA流程待办提醒
String type = reqDTO.getMinOrMpType() ; String type = reqDTO.getMinOrMpType() ;
if( type == null || type.equals("1") ) { if( type == null || type.equals("1") ) {
socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ;
} else {
socialClientService.getWxMaService().getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO)); socialClientService.getWxMaService().getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO));
} else {
socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ;
} }
return success(1L); return success(1L);
} }