diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java index 23709360a..b2f28554a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java @@ -20,9 +20,6 @@ public class BaseBO { protected LocalDateTime endTime; - - protected Map orderBy = new HashMap<>(); - /** * bo转换成queryWrapper * diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java index 113c1589b..cbfd3bc31 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java @@ -262,7 +262,12 @@ public class VlogUploadController extends BaseInfoProperties { // 调用服务层方法 vlogUploadService.forbidMediaDistribution(fileIds, operation); - + // 如果是禁播操作，将数据库中的状态改为4（删除） + if ("forbid".equals(operation)) { + for (String fileId : fileIds) { + vlogService.updateVlogStatus(fileId, 4, "视频已被禁播"); + } + } // 返回成功结果 return R.ok("操作成功"); } catch (IllegalArgumentException e) { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountChangeRecordController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountChangeRecordController.java index 91f540657..2f91f2edc 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountChangeRecordController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountChangeRecordController.java @@ -48,7 +48,7 @@ public class MemberAccountChangeRecordController extends BaseController { @SaCheckPermission("ums:accountchange:list") @PostMapping("list") public R> list(@RequestBody MemberAccountChangeRecordBO bo, - Page page) { + @RequestBody Page page) { Page memberPage = service.page(page,bo.toWrapper()); return R.ok(convert.toVO(memberPage)); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java index 783157be4..9612de2c3 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java @@ -34,7 +34,7 @@ public class MemberAccountController { @Tag(name ="查询会员账户表列表") @PostMapping("/list") - public R> list(@RequestBody MemberAccountBO query, Page page) { + public R> list(@RequestBody MemberAccountBO query, @RequestBody Page page) { Page 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 export(MemberAccountBO query) { + public R export(MemberAccountBO query) { List list = service.list(query.toWrapper()); ExcelUtil 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 getInfo(@PathVariable("memberId") Long memberId) { - return ResponseEntity.ok(convert.toVO(service.getById(memberId))); + public R getInfo(@PathVariable("memberId") Long memberId) { + return R.ok(convert.toVO(service.getById(memberId))); } @Tag(name ="新增会员账户表") @Log(title = "会员账户表", businessType = BusinessType.INSERT) @PostMapping("/add") - public ResponseEntity add(@RequestBody MemberAccountBO memberAccount) { - return ResponseEntity.ok(service.save(convert.toPo(memberAccount))); + public R add(@RequestBody MemberAccountBO memberAccount) { + return R.ok(service.save(convert.toPo(memberAccount))); } @Tag(name ="修改会员账户表") @Log(title = "会员账户表", businessType = BusinessType.UPDATE) @PutMapping("/update") - public ResponseEntity edit(@RequestBody MemberAccountBO memberAccount) { - return ResponseEntity.ok(service.updateById(convert.toPo(memberAccount))); + public R edit(@RequestBody MemberAccountBO memberAccount) { + return R.ok(service.updateById(convert.toPo(memberAccount))); } @Tag(name ="删除会员账户表") @Log(title = "会员账户表", businessType = BusinessType.DELETE) @DeleteMapping("/{memberId}") - public ResponseEntity remove(@PathVariable Long memberId) { - return ResponseEntity.ok(service.removeById(memberId)); + public R remove(@PathVariable Long memberId) { + return R.ok(service.removeById(memberId)); } } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java index 1b2b71bf5..3db97d2c3 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java @@ -37,45 +37,45 @@ public class MemberAddressController { @Tag(name ="查询会员收货地址列表") @PostMapping("/list") - public R list(@RequestBody MemberAddressBO query, IPage page) { - Page list =(Page ) service.page(page,query.toWrapper()); + public R list(@RequestBody MemberAddressBO query,@RequestBody Page page) { + Page list = service.page(page,query.toWrapper()); return R.ok(convert.toVO(list)); } @Tag(name ="导出会员收货地址列表") @Log(title = "会员收货地址", businessType = BusinessType.EXPORT) @PostMapping("/export") - public ResponseEntity export(MemberAddressBO query) { + public R export(MemberAddressBO query) { List list = service.list(query.toWrapper()); ExcelUtil 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 getInfo(@PathVariable("id") Long id) { - return ResponseEntity.ok(service.getById(id)); + public R getInfo(@PathVariable("id") Long id) { + return R.ok(service.getById(id)); } @Tag(name ="新增会员收货地址") @Log(title = "会员收货地址", businessType = BusinessType.INSERT) @PostMapping("/add") - public ResponseEntity add(@RequestBody MemberAddress memberAddress) { - return ResponseEntity.ok(service.save(memberAddress)); + public R 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 remove(@PathVariable Long id) { - return ResponseEntity.ok(service.removeById(id)); + public R remove(@PathVariable Long id) { + return R.ok(service.removeById(id)); } } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java index b78b8e572..270ddac39 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java @@ -34,7 +34,7 @@ public class MemberCartController extends BaseController { @Tag(name = "查询购物车列表") @PostMapping("/list") - public R> list(@RequestBody MemberCartBO query, IPage page) { + public R> list(@RequestBody MemberCartBO query, @RequestBody IPage page) { Page userPage = (Page) service.page(page, new QueryWrapper()); return R.ok(convert.toVO(userPage)); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java index 2810a4883..674917116 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java @@ -41,7 +41,7 @@ public class MemberController extends BaseController { @Tag(name = "查询会员信息列表") @SaCheckPermission("ums:member:list") @PostMapping("list") - public R> list(@RequestBody MemberBO bo, Page page) { + public R> list(@RequestBody MemberBO bo,@RequestBody Page page) { Page 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 export(MemberBO query) { + public R export(MemberBO query) { List list = service.list(query.toWapper()); ExcelUtil 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 getInfo(@PathVariable("id") Long id) { - return ResponseEntity.ok(convert.toVO(service.getById(id))); + public R 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 getPhoneDecrypted(@PathVariable String phoneEncrypted){ - return ResponseEntity.ok(service.getPhoneDecrypted(phoneEncrypted)); + public R getPhoneDecrypted(@PathVariable String phoneEncrypted){ + return R.ok(service.getPhoneDecrypted(phoneEncrypted)); } @Tag(name ="查看会员统计数据") @GetMapping("view/statistics/{memberId}") - public ResponseEntity viewStatistics(@PathVariable Long memberId){ + public R viewStatistics(@PathVariable Long memberId){ // return ResponseEntity.ok(service.viewStatistics(memberId)); return null; } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberLoginInfoController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberLoginInfoController.java index e2603312d..4a0370f6a 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberLoginInfoController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberLoginInfoController.java @@ -36,7 +36,7 @@ public class MemberLoginInfoController extends BaseController { @Tag(name ="查询会员登录记录列表") @SaCheckPermission("ums:memberlogininfo:list") @PostMapping("list") - public R> list(@RequestBody MemberLoginInfoBO query, Page page) { + public R> list(@RequestBody MemberLoginInfoBO query, @RequestBody Page page) { Page list = service.page(page,query.toWrapper()); return R.ok(convert.toVO(list)); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/FeedbackBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/FeedbackBO.java index bab6d4f27..6f1d68ba9 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/FeedbackBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/FeedbackBO.java @@ -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 ="处理结果") diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java index 8f37ac744..0c7868b54 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java @@ -96,4 +96,8 @@ public class Member extends BaseAudit { private Long openId; + @Schema(description ="用户id") + private Long userId; + + } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberVO.java index ff7cc1482..98fd8f5ab 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberVO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberVO.java @@ -136,5 +136,8 @@ public class MemberVO { @Excel(name = "好友数") private Integer friendsCount; + /** 内部账号id*/ + private Long userId; + }