cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提交新功能 分销商 积分 会员体系

Browse Source
This commit is contained in:
xwxuan
2024-02-08 20:44:58 +08:00
parent 0e255d6c3a
commit 6f5e6e4662
928 changed files with 39318 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/controller/admin/wechattemplate/vo/WechatTemplateBaseVO.java
View File

@ -14,21 +14,21 @@ import javax.validation.constraints.*;
@Data
public class WechatTemplateBaseVO {
@Schema(description = "模板编号", required = true)
@Schema(description = "模板编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "模板编号不能为空")
private String tempkey;
@Schema(description = "模板名", required = true, example = "张三")
@Schema(description = "模板名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@NotNull(message = "模板名不能为空")
private String name;
@Schema(description = "回复内容", required = true)
@Schema(description = "回复内容", requiredMode = Schema.RequiredMode.REQUIRED)
private String content;
@Schema(description = "模板ID", example = "15656")
private String tempid;
@Schema(description = "状态", required = true, example = "1")
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态不能为空")
private Byte status;

4
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/controller/admin/wechattemplate/vo/WechatTemplateRespVO.java
View File

@ -10,10 +10,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true)
public class WechatTemplateRespVO extends WechatTemplateBaseVO {
@Schema(description = "模板id", required = true, example = "8445")
@Schema(description = "模板id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8445")
private Integer id;
@Schema(description = "添加时间", required = true)
@Schema(description = "添加时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
}

2
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/controller/admin/wechattemplate/vo/WechatTemplateUpdateReqVO.java
View File

@ -11,7 +11,7 @@ import javax.validation.constraints.*;
@ToString(callSuper = true)
public class WechatTemplateUpdateReqVO extends WechatTemplateBaseVO {
@Schema(description = "模板id", required = true, example = "8445")
@Schema(description = "模板id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8445")
@NotNull(message = "模板id不能为空")
private Integer id;

15
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/service/wechattemplate/WechatTemplateService.java
View File

@ -1,14 +1,17 @@
package co.yixiang.yshop.module.message.service.wechattemplate;
import java.util.*;
import javax.validation.*;
import co.yixiang.yshop.module.member.dal.dataobject.user.MemberUserDO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.*;
import co.yixiang.yshop.module.message.dal.dataobject.wechattemplate.WechatTemplateDO;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplateCreateReqVO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplateExportReqVO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplatePageReqVO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplateUpdateReqVO;
import co.yixiang.yshop.module.message.dal.dataobject.wechattemplate.WechatTemplateDO;
import com.baomidou.mybatisplus.extension.service.IService;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
/**
* 微信模板 Service 接口
*

23
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/service/wechattemplate/WechatTemplateServiceImpl.java
View File

@ -1,22 +1,23 @@
package co.yixiang.yshop.module.message.service.wechattemplate;
import co.yixiang.yshop.module.member.dal.dataobject.user.MemberUserDO;
import co.yixiang.yshop.module.member.dal.mysql.user.MemberUserMapper;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplateCreateReqVO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplateExportReqVO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplatePageReqVO;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.WechatTemplateUpdateReqVO;
import co.yixiang.yshop.module.message.convert.wechattemplate.WechatTemplateConvert;
import co.yixiang.yshop.module.message.dal.dataobject.wechattemplate.WechatTemplateDO;
import co.yixiang.yshop.module.message.dal.mysql.wechattemplate.WechatTemplateMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import co.yixiang.yshop.module.message.controller.admin.wechattemplate.vo.*;
import co.yixiang.yshop.module.message.dal.dataobject.wechattemplate.WechatTemplateDO;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.message.convert.wechattemplate.WechatTemplateConvert;
import co.yixiang.yshop.module.message.dal.mysql.wechattemplate.WechatTemplateMapper;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
import static co.yixiang.yshop.framework.common.exception.util.ServiceExceptionUtil.exception;
import static co.yixiang.yshop.module.message.enums.ErrorCodeConstants.*;
import static co.yixiang.yshop.module.message.enums.ErrorCodeConstants.WECHAT_TEMPLATE_NOT_EXISTS;
/**
* 微信模板 Service 实现类

9
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/supply/WeiXinSubscribeService.java
View File

@ -5,7 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
import cn.hutool.core.util.StrUtil;
import co.yixiang.yshop.framework.common.constant.ShopConstants;
import co.yixiang.yshop.framework.common.exception.ErrorCode;
import co.yixiang.yshop.module.member.api.user.dto.WechatUserDto;
import co.yixiang.yshop.module.member.api.user.dto.WechatUserDTO;
import co.yixiang.yshop.module.member.dal.dataobject.user.MemberUserDO;
import co.yixiang.yshop.module.member.service.user.MemberUserService;
import co.yixiang.yshop.module.message.dal.dataobject.wechattemplate.WechatTemplateDO;
@ -150,7 +150,6 @@ public class WeiXinSubscribeService {
* @param templateId 模板id
* @param page 跳转页面
* @param map map内容
* @return String
*/
private void sendSubscribeMsg(String openId, String templateId, String page, Map<String,String> map){
WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage.builder()
@ -195,14 +194,14 @@ public class WeiXinSubscribeService {
return "";
}
WechatUserDto wechatUserDto = yxUser.getWxProfile();
WechatUserDTO wechatUserDto = yxUser.getWxProfile();
if(wechatUserDto == null) {
return "";
}
if(StrUtil.isBlank(wechatUserDto.getRoutineOpenid())) {
if(StrUtil.isBlank(wechatUserDto.getRoutineOpenId())) {
return "";
}
return wechatUserDto.getRoutineOpenid();
return wechatUserDto.getRoutineOpenId();
}
}

8
yshop-module-message/yshop-module-message-biz/src/main/java/co/yixiang/yshop/module/message/supply/WeixinTemplateService.java
View File

@ -12,7 +12,7 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.yshop.framework.common.constant.ShopConstants;
import co.yixiang.yshop.framework.common.enums.ShopCommonEnum;
import co.yixiang.yshop.framework.common.exception.ErrorCode;
import co.yixiang.yshop.module.member.api.user.dto.WechatUserDto;
import co.yixiang.yshop.module.member.api.user.dto.WechatUserDTO;
import co.yixiang.yshop.module.member.dal.dataobject.user.MemberUserDO;
import co.yixiang.yshop.module.member.service.user.MemberUserService;
import co.yixiang.yshop.module.message.dal.dataobject.wechattemplate.WechatTemplateDO;
@ -226,14 +226,14 @@ public class WeixinTemplateService {
return "";
}
WechatUserDto wechatUserDto = yxUser.getWxProfile();
WechatUserDTO wechatUserDto = yxUser.getWxProfile();
if(wechatUserDto == null) {
return "";
}
if(StrUtil.isBlank(wechatUserDto.getOpenid())) {
if(StrUtil.isBlank(wechatUserDto.getOpenId())) {
return "";
}
return wechatUserDto.getOpenid();
return wechatUserDto.getOpenId();
}