diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java index 25eac34..66d706b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java @@ -45,9 +45,10 @@ public class MemberAddressController extends BaseController { @ApiOperation("查询会员收货地址列表") @PreAuthorize("@ss.hasPermi('ums:memberAddress:list')") @PostMapping("/list") - public ResponseEntity> list(@RequestBody MemberAddressQuery query, Pageable page) { + public ResponseEntity> list(@RequestBody MemberAddressQuery query, Pageable page) { List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); + List resList = convert.dos2vos(list); + return ResponseEntity.ok(new PageImpl<>(resList, page, ((com.github.pagehelper.Page)list).getTotal())); } @ApiOperation("导出会员收货地址列表") @@ -55,9 +56,10 @@ public class MemberAddressController extends BaseController { @Log(title = "会员收货地址", businessType = BusinessType.EXPORT) @GetMapping("/export") public ResponseEntity export(MemberAddressQuery query) { - List list = service.selectList(query, null); - ExcelUtil util = new ExcelUtil<>(MemberAddressVO.class); - return ResponseEntity.ok(util.writeExcel(convert.dos2vos(list), "会员收货地址数据")); +// List list = service.selectList(query, null); +// ExcelUtil util = new ExcelUtil<>(MemberAddressVO.class); +// return ResponseEntity.ok(util.writeExcel(convert.dos2vos(list), "会员收货地址数据")); + return null; } @ApiOperation("获取会员收货地址详细信息") diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java index f1bcdab..877f5b8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java @@ -2,6 +2,7 @@ package com.cyl.ums.controller; import java.util.List; +import com.cyl.ums.pojo.dto.ChangeMemberStatusDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.PageImpl; @@ -90,4 +91,11 @@ public class MemberController extends BaseController { public ResponseEntity remove(@PathVariable Long id) { return ResponseEntity.ok(service.deleteById(id)); } + + @ApiOperation(("修改会员账户状态")) + @Log(title = "会员信息", businessType = BusinessType.UPDATE) + @PostMapping("/status/change") + public ResponseEntity changeStatus(@RequestBody ChangeMemberStatusDTO dto){ + return ResponseEntity.ok(service.changeStatus(dto)); + } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/ChangeMemberStatusDTO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/ChangeMemberStatusDTO.java new file mode 100644 index 0000000..b454385 --- /dev/null +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/ChangeMemberStatusDTO.java @@ -0,0 +1,9 @@ +package com.cyl.ums.pojo.dto; + +import lombok.Data; + +@Data +public class ChangeMemberStatusDTO { + private Long memberId; + private Integer status; +} diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java index 1983dde..c8d02b6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java @@ -2,13 +2,17 @@ package com.cyl.ums.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cyl.ums.convert.MemberAddressConvert; import com.cyl.ums.domain.MemberAddress; import com.cyl.ums.mapper.MemberAddressMapper; import com.cyl.ums.pojo.query.MemberAddressQuery; +import com.cyl.ums.pojo.vo.MemberAddressVO; import com.github.pagehelper.PageHelper; +import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.SecurityUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -24,6 +28,10 @@ import java.util.List; public class MemberAddressService { @Autowired private MemberAddressMapper memberAddressMapper; + @Autowired + private MemberAddressConvert memberAddressConvert; + @Value("${aes.key}") + private String aesKey; /** * 查询会员收货地址 @@ -47,21 +55,13 @@ public class MemberAddressService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - Long memberId = query.getMemberId(); - if (memberId != null) { - qw.eq("member_id", memberId); - } String nameLike = query.getNameLike(); if (!StringUtils.isEmpty(nameLike)) { qw.like("name", nameLike); } String phone = query.getPhone(); if (!StringUtils.isEmpty(phone)) { - qw.eq("phone", phone); - } - Integer defaultStatus = query.getDefaultStatus(); - if (defaultStatus != null) { - qw.eq("default_status", defaultStatus); + qw.eq("phone_encrypted", AesCryptoUtils.encrypt(aesKey, phone)); } String postCode = query.getPostCode(); if (!StringUtils.isEmpty(postCode)) { @@ -81,11 +81,7 @@ public class MemberAddressService { } String detailAddress = query.getDetailAddress(); if (!StringUtils.isEmpty(detailAddress)) { - qw.eq("detail_address", detailAddress); - } - Integer isDefault = query.getIsDefault(); - if (isDefault != null) { - qw.eq("is_default", isDefault); + qw.like("detail_address", detailAddress); } return memberAddressMapper.selectList(qw); } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java index 6a89bc7..f56b4c8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java @@ -8,8 +8,12 @@ import java.util.List; import java.time.LocalDate; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cyl.ums.pojo.dto.ChangeMemberStatusDTO; import com.github.pagehelper.PageHelper; +import com.ruoyi.common.utils.AesCryptoUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -27,6 +31,8 @@ import com.cyl.ums.pojo.query.MemberQuery; public class MemberService { @Autowired private MemberMapper memberMapper; + @Value("${aes.key}") + private String aesKey; /** * 查询会员信息 @@ -56,12 +62,15 @@ public class MemberService { } String phone = query.getPhone(); if (!StringUtils.isEmpty(phone)) { - qw.eq("phone", phone); + qw.eq("phone_encrypted", AesCryptoUtils.encrypt(aesKey, phone)); } if (!StringUtils.isEmpty(query.getBeginTime()) && !StringUtils.isEmpty(query.getEndTime())){ qw.ge("create_time", query.getBeginTime()); qw.lt("create_time", query.getEndTime()); } + if (query.getStatus() != null){ + qw.eq("status", query.getStatus()); + } return memberMapper.selectList(qw); } @@ -95,4 +104,11 @@ public class MemberService { public int deleteById(Long id) { return memberMapper.deleteById(id); } + + public Integer changeStatus(ChangeMemberStatusDTO dto) { + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("id", dto.getMemberId()); + wrapper.set("status", dto.getStatus()); + return memberMapper.update(null, wrapper); + } }