src/main/java/com/mzl/flower/config/PyamentV3Configurer.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/entity/menber/Member.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/mapper/member/MemberMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/web/member/MemberController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/mzl/flower/config/PyamentV3Configurer.java
@@ -20,7 +20,7 @@ public static String merchantId = "1661512517"; /** 商户API私钥路径 */ public static String privateKeyPath = "/opt/pay/wx/v3/apiclient_key.pem"; public static String privateKeyPath = "E:\\huamanyuan\\apiclient_key.pem"; /** 商户证书序列号 */ public static String merchantSerialNumber = "37A08A552943EF34883614DBC8DE281598148757"; src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
@@ -11,13 +11,13 @@ private Long id; @ApiModelProperty("会员等级名称") private String levelName; private String name; @ApiModelProperty("该等级所需的最低成长值") private int minGrowthValue; @ApiModelProperty("成长点-区间-开始") private int startPoint; @ApiModelProperty("该等级所需的最高成长值") private int maxGrowthValue; @ApiModelProperty("成长点-区间-结束") private int endPoint; @ApiModelProperty("会员折扣类型(百分比、固定金额)") private int discountType; @@ -32,8 +32,8 @@ private int consumptionAmount; @ApiModelProperty("已消费产生的成长值") private int upGrowthValue; private int growthValue; @ApiModelProperty("未消费产生的下降值") private int downGrowthValue; private int downgradeValue; } src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -19,13 +19,13 @@ public class Member extends BaseAutoEntity { @ApiModelProperty("会员等级名称") private String levelName; private String name; @ApiModelProperty("该等级所需的最低成长值") private int minGrowthValue; @ApiModelProperty("成长点-区间-开始") private int startPoint; @ApiModelProperty("该等级所需的最高成长值") private int maxGrowthValue; @ApiModelProperty("成长点-区间-结束") private int endPoint; @ApiModelProperty("会员折扣类型(百分比、固定金额)") private int discountType; @@ -40,8 +40,8 @@ private int consumptionAmount; @ApiModelProperty("已消费产生的成长值") private int upGrowthValue; private int growthValue; @ApiModelProperty("未消费产生的下降值") private int downGrowthValue; private int downgradeValue; } src/main/java/com/mzl/flower/mapper/member/MemberMapper.java
@@ -18,8 +18,7 @@ @Repository public interface MemberMapper extends BaseMapper<Member> { @SuppressWarnings("AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc") @Select("select * from t_member where level_name = #{levelName} and deleted = '0' limit 1") Member getMemberByName(@Param("levelName") String levelName); @Select("select * from t_member where name = #{name} and deleted = '0' limit 1") Member getMemberByName(@Param("name") String name); } src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
@@ -28,11 +28,11 @@ @Override public void saveMember(Member member) { if (StringUtils.isEmpty(member.getLevelName())) { if (StringUtils.isEmpty(member.getName())) { throw new ValidationException("会员等级名称不能为空"); } //保存时判断是否有重复的名称 Member memberByName = memberMapper.getMemberByName(member.getLevelName()); Member memberByName = memberMapper.getMemberByName(member.getName()); if (!ObjectUtils.isEmpty(memberByName)) { throw new ValidationException("会员等级名称重复"); } @@ -48,10 +48,10 @@ if (!memberInfo.getCreateBy().equals(SecurityUtils.getUserId())) { throw new ValidationException("无权限修改"); } Member memberTemp = memberMapper.getMemberByName(memberDTO.getLevelName()); Member memberTemp = memberMapper.getMemberByName(memberDTO.getName()); //判断如果按照会员等级查询到得名称和当前得Id不一致,不能修改。 if (!ObjectUtils.isEmpty(memberTemp)) { if (memberTemp.getLevelName().equals(memberDTO.getLevelName())) { if (memberTemp.getName().equals(memberDTO.getName())) { throw new ValidationException("已存在会员等级名称,无法修改"); } } src/main/java/com/mzl/flower/web/member/MemberController.java
@@ -38,7 +38,7 @@ @ApiOperation(value = "会员列表", httpMethod = "POST") public ResponseEntity<ReturnDataDTO> getMemberList(Page page, MemberQueryDTO dto) { QueryWrapper<Member> queryWrapper = new QueryWrapper(); queryWrapper.lambda().eq(isNotNull(dto.getLevelName()), Member::getLevelName, dto.getLevelName()); queryWrapper.lambda().eq(isNotNull(dto.getLevelName()), Member::getName, dto.getLevelName()); page = (Page) memberService.page(page, queryWrapper); return returnData(R.SUCCESS.getCode(), page); }