abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修改会员的controller

Browse Source
This commit is contained in:
王庆祥 2025-06-16 09:43:31 +08:00
parent c0484c2c71
commit f5fd633f8b
10 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java
View File

@ -20,9 +20,6 @@ public class BaseBO <T> {
protected LocalDateTime endTime;
protected Map<String,String> orderBy = new HashMap<>();
/**
* bo转换成queryWrapper
*

2
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountChangeRecordController.java
View File

@ -48,7 +48,7 @@ public class MemberAccountChangeRecordController extends BaseController {
@SaCheckPermission("ums:accountchange:list")
@PostMapping("list")
public R<Page<MemberAccountChangeRecordVO>> list(@RequestBody MemberAccountChangeRecordBO bo,
Page<MemberAccountChangeRecord> page) {
@RequestBody Page<MemberAccountChangeRecord> page) {
Page<MemberAccountChangeRecord> memberPage = service.page(page,bo.toWrapper());
return R.ok(convert.toVO(memberPage));
}

22
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java
View File

@ -34,7 +34,7 @@ public class MemberAccountController {
@Tag(name ="查询会员账户表列表")
@PostMapping("/list")
public R<IPage<MemberAccountVO>> list(@RequestBody MemberAccountBO query, Page page) {
public R<IPage<MemberAccountVO>> list(@RequestBody MemberAccountBO query, @RequestBody Page page) {
Page<MemberAccount> list = service.page(page,query.toWrapper() );
return R.ok(convert.toVO(list));
}
@ -42,37 +42,37 @@ public class MemberAccountController {
@Tag(name ="导出会员账户表列表")
@Log(title = "会员账户表", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public ResponseEntity<String> export(MemberAccountBO query) {
public R<String> export(MemberAccountBO query) {
List<MemberAccount> list = service.list(query.toWrapper());
ExcelUtil<MemberAccountVO> util = new ExcelUtil<>(MemberAccountVO.class);
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "会员账户表数据"));
return R.ok(util.writeExcel(convert.toVO(list), "会员账户表数据"));
}
@Tag(name ="获取会员账户表详细信息")
@GetMapping(value = "/{memberId}")
public ResponseEntity<MemberAccountVO> getInfo(@PathVariable("memberId") Long memberId) {
return ResponseEntity.ok(convert.toVO(service.getById(memberId)));
public R<MemberAccountVO> getInfo(@PathVariable("memberId") Long memberId) {
return R.ok(convert.toVO(service.getById(memberId)));
}
@Tag(name ="新增会员账户表")
@Log(title = "会员账户表", businessType = BusinessType.INSERT)
@PostMapping("/add")
public ResponseEntity<Object> add(@RequestBody MemberAccountBO memberAccount) {
return ResponseEntity.ok(service.save(convert.toPo(memberAccount)));
public R<Object> add(@RequestBody MemberAccountBO memberAccount) {
return R.ok(service.save(convert.toPo(memberAccount)));
}
@Tag(name ="修改会员账户表")
@Log(title = "会员账户表", businessType = BusinessType.UPDATE)
@PutMapping("/update")
public ResponseEntity<Object> edit(@RequestBody MemberAccountBO memberAccount) {
return ResponseEntity.ok(service.updateById(convert.toPo(memberAccount)));
public R<Object> edit(@RequestBody MemberAccountBO memberAccount) {
return R.ok(service.updateById(convert.toPo(memberAccount)));
}
@Tag(name ="删除会员账户表")
@Log(title = "会员账户表", businessType = BusinessType.DELETE)
@DeleteMapping("/{memberId}")
public ResponseEntity<Object> remove(@PathVariable Long memberId) {
return ResponseEntity.ok(service.removeById(memberId));
public R<Object> remove(@PathVariable Long memberId) {
return R.ok(service.removeById(memberId));
}
}

24
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java
View File

@ -37,45 +37,45 @@ public class MemberAddressController {
@Tag(name ="查询会员收货地址列表")
@PostMapping("/list")
public R list(@RequestBody MemberAddressBO query, IPage page) {
Page<MemberAddress> list =(Page<MemberAddress> ) service.page(page,query.toWrapper());
public R list(@RequestBody MemberAddressBO query,@RequestBody Page<MemberAddress> page) {
Page<MemberAddress> list = service.page(page,query.toWrapper());
return R.ok(convert.toVO(list));
}
@Tag(name ="导出会员收货地址列表")
@Log(title = "会员收货地址", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public ResponseEntity<String> export(MemberAddressBO query) {
public R<String> export(MemberAddressBO query) {
List<MemberAddress> list = service.list(query.toWrapper());
ExcelUtil<MemberAddressVO> util = new ExcelUtil<>(MemberAddressVO.class);
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "会员收货地址数据"));
return R.ok(util.writeExcel(convert.toVO(list), "会员收货地址数据"));
}
@Tag(name ="获取会员收货地址详细信息")
@GetMapping(value = "/{id}")
public ResponseEntity<MemberAddress> getInfo(@PathVariable("id") Long id) {
return ResponseEntity.ok(service.getById(id));
public R<MemberAddress> getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
}
@Tag(name ="新增会员收货地址")
@Log(title = "会员收货地址", businessType = BusinessType.INSERT)
@PostMapping("/add")
public ResponseEntity<Object> add(@RequestBody MemberAddress memberAddress) {
return ResponseEntity.ok(service.save(memberAddress));
public R<Object> add(@RequestBody MemberAddress memberAddress) {
return R.ok(service.save(memberAddress));
}
@Tag(name ="修改会员收货地址")
@Log(title = "会员收货地址", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public ResponseEntity edit(@RequestBody MemberAddress memberAddress) {
public R edit(@RequestBody MemberAddress memberAddress) {
service.updateById(memberAddress);
return ResponseEntity.ok(null);
return R.ok(null);
}
@Tag(name ="删除会员收货地址")
@Log(title = "会员收货地址", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public ResponseEntity<Object> remove(@PathVariable Long id) {
return ResponseEntity.ok(service.removeById(id));
public R<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}
}

2
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java
View File

@ -34,7 +34,7 @@ public class MemberCartController extends BaseController {
@Tag(name = "查询购物车列表")
@PostMapping("/list")
public R<Page<MemberCartVO>> list(@RequestBody MemberCartBO query, IPage page) {
public R<Page<MemberCartVO>> list(@RequestBody MemberCartBO query, @RequestBody IPage page) {
Page<MemberCart> userPage = (Page<MemberCart>) service.page(page, new QueryWrapper<MemberCart>());
return R.ok(convert.toVO(userPage));
}

16
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java
View File

@ -41,7 +41,7 @@ public class MemberController extends BaseController {
@Tag(name = "查询会员信息列表")
@SaCheckPermission("ums:member:list")
@PostMapping("list")
public R<Page<MemberVO>> list(@RequestBody MemberBO bo, Page<Member> page) {
public R<Page<MemberVO>> list(@RequestBody MemberBO bo,@RequestBody Page<Member> page) {
Page<Member> memberPage = service.page(page,bo.toWapper());
TableDataInfo.build(memberPage);
return R.ok(convert.toVO(memberPage));
@ -51,17 +51,17 @@ public class MemberController extends BaseController {
@SaCheckPermission("ums:member:export")
@Log(title = "会员信息", businessType = BusinessType.EXPORT)
@PostMapping("export")
public ResponseEntity<String> export(MemberBO query) {
public R<String> export(MemberBO query) {
List<Member> list = service.list(query.toWapper());
ExcelUtil<MemberVO> util = new ExcelUtil<>(MemberVO.class);
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "会员信息数据"));
return R.ok(util.writeExcel(convert.toVO(list), "会员信息数据"));
}
@Tag(name ="获取会员信息详细信息")
@SaCheckPermission("ums:member:query")
@GetMapping(value = "{id}")
public ResponseEntity<MemberVO> getInfo(@PathVariable("id") Long id) {
return ResponseEntity.ok(convert.toVO(service.getById(id)));
public R<MemberVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name ="新增会员信息")
@ -105,13 +105,13 @@ public class MemberController extends BaseController {
@Tag(name ="会员手机号解密")
@GetMapping("phone/decrypt/{phoneEncrypted}")
public ResponseEntity<String> getPhoneDecrypted(@PathVariable String phoneEncrypted){
return ResponseEntity.ok(service.getPhoneDecrypted(phoneEncrypted));
public R<String> getPhoneDecrypted(@PathVariable String phoneEncrypted){
return R.ok(service.getPhoneDecrypted(phoneEncrypted));
}
@Tag(name ="查看会员统计数据")
@GetMapping("view/statistics/{memberId}")
public ResponseEntity<MemberDataStatisticsVO> viewStatistics(@PathVariable Long memberId){
public R<MemberDataStatisticsVO> viewStatistics(@PathVariable Long memberId){
// return ResponseEntity.ok(service.viewStatistics(memberId));
return null;
}

2
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberLoginInfoController.java
View File

@ -36,7 +36,7 @@ public class MemberLoginInfoController extends BaseController {
@Tag(name ="查询会员登录记录列表")
@SaCheckPermission("ums:memberlogininfo:list")
@PostMapping("list")
public R<Page<MemberLoginInfoVO>> list(@RequestBody MemberLoginInfoBO query, Page page) {
public R<Page<MemberLoginInfoVO>> list(@RequestBody MemberLoginInfoBO query, @RequestBody Page page) {
Page<MemberLoginInfo> list = service.page(page,query.toWrapper());
return R.ok(convert.toVO(list));
}

2
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/FeedbackBO.java
View File

@ -56,7 +56,7 @@ public class FeedbackBO extends BaseBO {
@Schema(description ="处理人")
private Long handlerId;
@Schema(description ="处理结果类型 0：文本 1：图片")
@Schema(description ="处理结果类型 ")
private Integer resultType;
@Schema(description ="处理结果")

4
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java
View File

@ -96,4 +96,8 @@ public class Member extends BaseAudit {
private Long openId;
@Schema(description ="用户id")
private Long userId;
}

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberVO.java
View File

@ -136,5 +136,8 @@ public class MemberVO {
@Excel(name = "好友数")
private Integer friendsCount;
/** 内部账号id*/
private Long userId;
}