From 7c476f0e7385e09d6718d14132f7ab6ce3b90679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Tue, 26 Mar 2024 11:23:22 +0800 Subject: [PATCH] init --- .../xq/controller/WxTransDataController.java | 28 +++++---- .../xq/controller/WxTransLogController.java | 5 +- .../xq/controller/WxTransOrderController.java | 3 +- .../controller/app/AccountAppController.java | 12 ++++ .../java/com/ruoyi/xq/domain/WxTransData.java | 1 + .../dto/admin/account/WxTransDataAdminVo.java | 15 +++++ .../dto/admin/account/WxTransLogAdminVo.java | 11 ++++ .../WxTransOrderAdminVo.java | 3 +- .../dto/app/account/WxTransDataApplyReq.java | 14 +++++ .../xq/enums/common/SystemConfigEnum.java | 2 +- .../ruoyi/xq/mapper/WxTransDataMapper.java | 3 + .../com/ruoyi/xq/mapper/WxTransLogMapper.java | 4 ++ .../ruoyi/xq/mapper/WxTransOrderMapper.java | 2 +- .../ruoyi/xq/service/WxTransDataService.java | 12 +++- .../ruoyi/xq/service/WxTransLogService.java | 3 + .../ruoyi/xq/service/WxTransOrderService.java | 2 +- .../service/impl/UserExtendServiceImpl.java | 2 +- .../service/impl/WxTransDataServiceImpl.java | 63 +++++++++++++++++++ .../service/impl/WxTransLogServiceImpl.java | 8 ++- .../service/impl/WxTransOrderServiceImpl.java | 2 +- .../resources/mapper/xq/WxTransDataMapper.xml | 32 ++++++++++ .../resources/mapper/xq/WxTransLogMapper.xml | 27 +++++--- .../mapper/xq/WxTransOrderMapper.xml | 2 +- 23 files changed, 221 insertions(+), 35 deletions(-) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransDataAdminVo.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransLogAdminVo.java rename ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/{wxtrans => account}/WxTransOrderAdminVo.java (83%) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/WxTransDataApplyReq.java diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransDataController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransDataController.java index f97762a..b60c2f3 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransDataController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransDataController.java @@ -1,7 +1,6 @@ package com.ruoyi.xq.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -9,9 +8,10 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.WxTransData; +import com.ruoyi.xq.dto.admin.account.WxTransDataAdminVo; +import com.ruoyi.xq.dto.app.common.IdReq; import com.ruoyi.xq.service.WxTransDataService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -40,8 +40,8 @@ public class WxTransDataController extends BaseController { */ @SaCheckPermission("xq:wxTransData:list") @GetMapping("/list") - public TableDataInfo list(WxTransData bo, PageQuery pageQuery) { - Page page = wxTransDataService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(WxTransDataAdminVo bo, PageQuery pageQuery) { + Page page = wxTransDataService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -58,15 +58,21 @@ public class WxTransDataController extends BaseController { } - /** - * 修改微信交换数据 - */ @SaCheckPermission("xq:wxTransData:edit") - @Log(title = "微信交换数据", businessType = BusinessType.UPDATE) + @Log(title = "后台管理接受微信交换数据", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody WxTransData bo) { - return toAjax(wxTransDataService.updateById(bo)); + @PostMapping("/allow") + public R allow(@RequestBody IdReq bo) { + return toAjax(wxTransDataService.allowAdmin(bo.getId())); + } + + + @SaCheckPermission("xq:wxTransData:edit") + @Log(title = "后台管理拒绝微信交换数据", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PostMapping("/notAllow") + public R notAllow(@RequestBody IdReq bo) { + return toAjax(wxTransDataService.notAllowAdmin(bo.getId())); } /** diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransLogController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransLogController.java index 1c721f2..b13fd33 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransLogController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransLogController.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.WxTransLog; +import com.ruoyi.xq.dto.admin.account.WxTransLogAdminVo; import com.ruoyi.xq.service.WxTransLogService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -38,8 +39,8 @@ public class WxTransLogController extends BaseController { */ @SaCheckPermission("xq:wxTransLog:list") @GetMapping("/list") - public TableDataInfo list(WxTransLog bo, PageQuery pageQuery) { - Page page = wxTransLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(WxTransLogAdminVo bo, PageQuery pageQuery) { + Page page = wxTransLogService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransOrderController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransOrderController.java index aa78601..d7d8301 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransOrderController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransOrderController.java @@ -1,7 +1,6 @@ package com.ruoyi.xq.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -13,7 +12,7 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.WxTransOrder; -import com.ruoyi.xq.dto.admin.wxtrans.WxTransOrderAdminVo; +import com.ruoyi.xq.dto.admin.account.WxTransOrderAdminVo; import com.ruoyi.xq.service.WxTransOrderService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java index 09ffa3b..5f280bd 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java @@ -83,6 +83,15 @@ public class AccountAppController { return R.ok(result); } + @PostMapping("/wxTrans/apply") + @Operation(summary = "处理交换微信") + @Log(title = "处理交换微信", businessType = BusinessType.OTHER, isSaveDb = false) + public R applyWxTrans(@RequestBody WxTransDataApplyReq req){ + req.setUserId(LoginHelper.getUserId()); + wxTransDataService.apply(req); + return R.ok(); + } + @PostMapping("/wxTrans/star") @Operation(summary = "发起交换微信") @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false) @@ -92,6 +101,7 @@ public class AccountAppController { return R.ok(); } + @GetMapping("/wxTrans/data/page") @Operation(summary = "查询交换微信数据") @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false) @@ -111,4 +121,6 @@ public class AccountAppController { } + + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/WxTransData.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/WxTransData.java index 88dc34d..b0678bb 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/WxTransData.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/WxTransData.java @@ -52,6 +52,7 @@ public class WxTransData implements Serializable { * 0-待接收 1-接受交换 2-拒绝交换 */ private Integer status; + private Integer isAdmin; /** * 后台操作管理员ID */ diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransDataAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransDataAdminVo.java new file mode 100644 index 0000000..7bd84f5 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransDataAdminVo.java @@ -0,0 +1,15 @@ +package com.ruoyi.xq.dto.admin.account; + +import com.ruoyi.xq.domain.WxTransData; +import lombok.Data; + +@Data +public class WxTransDataAdminVo extends WxTransData { + + private String sponsorNickname; + private String sponsorMobile; + private String sponsorAvatar; + private String receiveNickname; + private String receiveMobile; + private String receiveAvatar; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransLogAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransLogAdminVo.java new file mode 100644 index 0000000..03b5f08 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransLogAdminVo.java @@ -0,0 +1,11 @@ +package com.ruoyi.xq.dto.admin.account; + +import com.ruoyi.xq.domain.WxTransLog; +import lombok.Data; + +@Data +public class WxTransLogAdminVo extends WxTransLog { + private String nickname; + private String mobile; + private String avatar; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/wxtrans/WxTransOrderAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransOrderAdminVo.java similarity index 83% rename from ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/wxtrans/WxTransOrderAdminVo.java rename to ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransOrderAdminVo.java index 7c3885c..90ecffd 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/wxtrans/WxTransOrderAdminVo.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/account/WxTransOrderAdminVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.xq.dto.admin.wxtrans; +package com.ruoyi.xq.dto.admin.account; import com.ruoyi.xq.domain.WxTransOrder; import lombok.Data; @@ -7,6 +7,5 @@ import lombok.Data; public class WxTransOrderAdminVo extends WxTransOrder { private String nickname; private String mobile; - private String avatar; } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/WxTransDataApplyReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/WxTransDataApplyReq.java new file mode 100644 index 0000000..170cafb --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/WxTransDataApplyReq.java @@ -0,0 +1,14 @@ +package com.ruoyi.xq.dto.app.account; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class WxTransDataApplyReq { + @Schema(hidden = true) + private Long userId; + @Schema(description = "数据交换ID") + private Long id; + @Schema(description = "1-接受 2-拒绝") + private Integer apply; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/SystemConfigEnum.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/SystemConfigEnum.java index a0aecca..46bd37c 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/SystemConfigEnum.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/SystemConfigEnum.java @@ -15,7 +15,7 @@ import lombok.Setter; public enum SystemConfigEnum { // TODO 限制为两位小数 WX_TRANS_PRICE("0.01", "微信交换次数价格", SystemConfigGroupEnum.BUSINESS, null), - VIP_INVITE_RATE("0.30","默认会员分销价格",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), + VIP_INVITE_RATE("0.30","默认会员分销比例",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), SENSITIVE_ENABLE("1", "是否开启手机号脱敏",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SYSTEM), PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM), diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransDataMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransDataMapper.java index 33efdff..5dedb67 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransDataMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransDataMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.WxTransData; +import com.ruoyi.xq.dto.admin.account.WxTransDataAdminVo; import com.ruoyi.xq.dto.app.account.StarWxTransReq; import com.ruoyi.xq.dto.app.account.WxTransDataQuery; import org.apache.ibatis.annotations.Param; @@ -16,4 +17,6 @@ import org.apache.ibatis.annotations.Param; public interface WxTransDataMapper extends BaseMapper { Page pageApp(@Param("build") Page build, @Param("query") WxTransDataQuery query); + + Page pageAdmin(@Param("build") Page build, @Param("bo") WxTransDataAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransLogMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransLogMapper.java index 6ff9d69..4fab14c 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransLogMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransLogMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.WxTransLog; +import com.ruoyi.xq.dto.admin.account.WxTransLogAdminVo; +import org.apache.ibatis.annotations.Param; /** * 微信交换记录Mapper接口 @@ -11,4 +14,5 @@ import com.ruoyi.xq.domain.WxTransLog; */ public interface WxTransLogMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") WxTransLogAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransOrderMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransOrderMapper.java index 8139a35..b9c41c0 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransOrderMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransOrderMapper.java @@ -3,7 +3,7 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.WxTransOrder; -import com.ruoyi.xq.dto.admin.wxtrans.WxTransOrderAdminVo; +import com.ruoyi.xq.dto.admin.account.WxTransOrderAdminVo; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransDataService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransDataService.java index df67879..f5d3e34 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransDataService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransDataService.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.WxTransData; +import com.ruoyi.xq.dto.admin.account.WxTransDataAdminVo; import com.ruoyi.xq.dto.app.account.StarWxTransReq; +import com.ruoyi.xq.dto.app.account.WxTransDataApplyReq; import com.ruoyi.xq.dto.app.account.WxTransDataListAppVo; import com.ruoyi.xq.dto.app.account.WxTransDataQuery; @@ -18,5 +20,13 @@ public interface WxTransDataService extends IService { void start(StarWxTransReq starWxTransReq); - Page pageApp(PageQuery pageQuery, WxTransDataQuery wxTransDataQuery); + void apply(WxTransDataApplyReq req); + + Page pageApp(PageQuery pageQuery, WxTransDataQuery wxTransDataQuery); + + Page pageAdmin(PageQuery pageQuery, WxTransDataAdminVo bo); + + boolean allowAdmin(Long id); + + boolean notAllowAdmin(Long id); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransLogService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransLogService.java index 514e100..e53f34c 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransLogService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransLogService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.User; import com.ruoyi.xq.domain.WxTransLog; +import com.ruoyi.xq.dto.admin.account.WxTransLogAdminVo; import com.ruoyi.xq.dto.app.account.WxTransLogListVo; import com.ruoyi.xq.dto.app.account.WxTransLogQuery; import com.ruoyi.xq.enums.account.WxTransLogCateEnum; @@ -18,9 +19,11 @@ import com.ruoyi.xq.enums.account.WxTransLogCateEnum; public interface WxTransLogService extends IService { Page pageApp(PageQuery pageQuery, WxTransLogQuery query); + Page pageAdmin(PageQuery pageQuery, WxTransLogAdminVo bo); void consumerSaveLog(Long sponsorUserId, String traceId, User receiveUser); void saveLog(Long userId, Integer wxTransNum, WxTransLogCateEnum cateEnum, String traceId, String remark); void saveLogAdmin(User user, Integer wxTransNum, String traceId); + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransOrderService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransOrderService.java index 4c8a7a2..3ff83fc 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransOrderService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransOrderService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.WxTransOrder; -import com.ruoyi.xq.dto.admin.wxtrans.WxTransOrderAdminVo; +import com.ruoyi.xq.dto.admin.account.WxTransOrderAdminVo; import com.ruoyi.xq.dto.app.pay.ConsumeResp; import com.ruoyi.xq.enums.pay.PlatformTypeEnum; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java index 648f452..6c0fae2 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java @@ -168,7 +168,7 @@ public class UserExtendServiceImpl extends ServiceImpl pageApp(PageQuery pageQuery, WxTransDataQuery wxTransDataQuery) { Page page = baseMapper.pageApp(pageQuery.build(), wxTransDataQuery); @@ -133,4 +165,35 @@ public class WxTransDataServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, WxTransDataAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(), bo); + } + + @Override + public boolean allowAdmin(Long id) { + boolean update = this.update(Wrappers.lambdaUpdate(WxTransData.class) + .eq(WxTransData::getId, id) + .eq(WxTransData::getStatus, WxTransDataStatusEnum.READY.getCode()) + .set(WxTransData::getStatus, WxTransDataStatusEnum.SUCCESS.getCode()) + .set(WxTransData::getOpTime, LocalDateTime.now()) + .set(WxTransData::getIsAdmin, 1) + .set(WxTransData::getAdminId, LoginHelper.getUserId()) + .set(WxTransData::getAdminName, LoginHelper.getUsername())); + return true; + } + + @Override + public boolean notAllowAdmin(Long id) { + boolean update = this.update(Wrappers.lambdaUpdate(WxTransData.class) + .eq(WxTransData::getId, id) + .eq(WxTransData::getStatus, WxTransDataStatusEnum.READY.getCode()) + .set(WxTransData::getStatus, WxTransDataStatusEnum.FAIL.getCode()) + .set(WxTransData::getOpTime, LocalDateTime.now()) + .set(WxTransData::getIsAdmin, 1) + .set(WxTransData::getAdminId, LoginHelper.getUserId()) + .set(WxTransData::getAdminName, LoginHelper.getUsername())); + return true; + } } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java index a2ce799..747ce99 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.User; import com.ruoyi.xq.domain.WxTransLog; +import com.ruoyi.xq.dto.admin.account.WxTransLogAdminVo; import com.ruoyi.xq.dto.app.account.WxTransLogListVo; import com.ruoyi.xq.dto.app.account.WxTransLogQuery; import com.ruoyi.xq.dto.common.user.MinUser; @@ -68,6 +69,11 @@ public class WxTransLogServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, WxTransLogAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(), bo); + } + @Override public void consumerSaveLog(Long sponsorUserId, String traceId, User receiveUser) { MinUser minUser = userService.getMinUserById(sponsorUserId); @@ -77,7 +83,7 @@ public class WxTransLogServiceImpl extends ServiceImpl + diff --git a/ruoyi-xq/src/main/resources/mapper/xq/WxTransLogMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/WxTransLogMapper.xml index 9b3a227..66ff4a4 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/WxTransLogMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/WxTransLogMapper.xml @@ -4,16 +4,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - + diff --git a/ruoyi-xq/src/main/resources/mapper/xq/WxTransOrderMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/WxTransOrderMapper.xml index 8cdb767..db5bd0a 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/WxTransOrderMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/WxTransOrderMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select t1.*, t2.nickname,t2.mobile,t2.avatar from xq_wx_trans_order t1 left join xq_user t2 on t1.user_id = t2.id