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

[fix]充值与提现

Browse Source
This commit is contained in:
王庆祥 2025-06-21 15:01:11 +08:00
parent 5d5702e202
commit ca99f31ebd
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java
View File

@ -2,6 +2,7 @@ package com.wzj.soopin.member.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.member.annotation.MemberFillMethod;
import com.wzj.soopin.member.convert.ChargeConvert; import com.wzj.soopin.member.convert.ChargeConvert;
import com.wzj.soopin.member.convert.MemberForbiddenConvert; import com.wzj.soopin.member.convert.MemberForbiddenConvert;
import com.wzj.soopin.member.domain.bo.ChargeBO; import com.wzj.soopin.member.domain.bo.ChargeBO;
@ -33,6 +34,7 @@ public class ChargeController {
@Tag(name = "查询列表") @Tag(name = "查询列表")
@PostMapping("/list") @PostMapping("/list")
@MemberFillMethod
public R<IPage<ChargeVO>> list(@RequestBody ChargeBO bo, @RequestBody Page page) { public R<IPage<ChargeVO>> list(@RequestBody ChargeBO bo, @RequestBody Page page) {
Page<Charge> pages = service.page(page, bo.toWrapper()); Page<Charge> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages)); return R.ok(convert.toVO(pages));
@ -47,6 +49,7 @@ public class ChargeController {
@Tag(name = "详情") @Tag(name = "详情")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@MemberFillMethod
public R<ChargeVO> getInfo(@PathVariable("id") Long id) { public R<ChargeVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id))); return R.ok(convert.toVO(service.getById(id)));
} }

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java
View File

@ -2,6 +2,7 @@ package com.wzj.soopin.member.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.member.annotation.MemberFillMethod;
import com.wzj.soopin.member.convert.MemberForbiddenConvert; import com.wzj.soopin.member.convert.MemberForbiddenConvert;
import com.wzj.soopin.member.convert.WithdrawConvert; import com.wzj.soopin.member.convert.WithdrawConvert;
import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; import com.wzj.soopin.member.domain.bo.MemberForbiddenBO;
@ -33,6 +34,7 @@ public class WithdrawController {
@Tag(name = "查询列表") @Tag(name = "查询列表")
@PostMapping("/list") @PostMapping("/list")
@MemberFillMethod
public R<IPage<WithdrawVO>> list(@RequestBody WithdrawBO bo, @RequestBody Page page) { public R<IPage<WithdrawVO>> list(@RequestBody WithdrawBO bo, @RequestBody Page page) {
Page<Withdraw> pages = service.page(page, bo.toWrapper()); Page<Withdraw> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages)); return R.ok(convert.toVO(pages));
@ -47,6 +49,7 @@ public class WithdrawController {
@Tag(name = "详情") @Tag(name = "详情")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@MemberFillMethod
public R<WithdrawVO> getInfo(@PathVariable("id") Long id) { public R<WithdrawVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id))); return R.ok(convert.toVO(service.getById(id)));
} }

7
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/config/RocketMQConfiguration.java
View File

@ -5,7 +5,6 @@ import org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration;
import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties; import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.apache.rocketmq.spring.support.RocketMQMessageConverter; import org.apache.rocketmq.spring.support.RocketMQMessageConverter;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -34,17 +33,17 @@ public class RocketMQConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(RocketMQTemplate.class) @ConditionalOnMissingBean(RocketMQTemplate.class)
@ConditionalOnBean(DefaultMQProducer.class) @ConditionalOnBean(DefaultMQProducer.class)
public RocketMQTemplate rocketMQTemplate(DefaultMQProducer mqProducer, public RocketMQTemplate rocketMQTemplate(DefaultMQProducer mqProducer,
RocketMQMessageConverter messageConverter) { RocketMQMessageConverter messageConverter) {
RocketMQTemplate rocketMQTemplate = new RocketMQTemplate(); RocketMQTemplate rocketMQTemplate = new RocketMQTemplate();
rocketMQTemplate.setProducer(mqProducer); rocketMQTemplate.setProducer(mqProducer);
rocketMQTemplate.setMessageConverter(messageConverter.getMessageConverter()); rocketMQTemplate.setMessageConverter(messageConverter.getMessageConverter());
return rocketMQTemplate; return rocketMQTemplate;
} }
@Bean @Bean
@ConditionalOnMissingBean(RocketMQMessageConverter.class) @ConditionalOnMissingBean(RocketMQMessageConverter.class)
public RocketMQMessageConverter rocketMQMessageConverter() { public RocketMQMessageConverter rocketMQMessageConverter() {
return new RocketMQMessageConverter(); return new RocketMQMessageConverter();
} }
} }