From 5c1479969161321ccf1f7494ed61a8911313ee8b Mon Sep 17 00:00:00 2001 From: wangqx Date: Thu, 26 Jun 2025 17:05:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[fix]=E5=88=86=E8=B4=A6=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=8E=E5=88=86=E8=B4=A6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +- ruoyi-admin/pom.xml | 6 + .../web/controller/CaptchaController.java | 4 +- .../src/main/resources/application-dev.yml | 6 +- ruoyi-modules/pom.xml | 1 + .../content/service/impl/VlogServiceImpl.java | 2 + ruoyi-modules/ruoyi-member/pom.xml | 8 +- .../member/controller/FeedbackController.java | 3 + .../soopin/member/convert/ChargeConvert.java | 19 --- .../member/domain/vo/YishengAccountVO.java | 48 -------- .../soopin/member/mapper/WithdrawMapper.java | 9 -- .../member/service/IWithdrawService.java | 15 --- .../member/service/IYishengService.java | 19 --- .../service/impl/MemberServiceImpl.java | 10 +- ruoyi-modules/ruoyi-transaction/pom.xml | 108 ++++++++++++++++++ .../controller/ChargeController.java | 19 ++- .../controller/DivideController.java | 64 +++++++++++ .../controller/DivideRuleController.java | 78 +++++++++++++ .../controller/WithdrawController.java | 19 ++- .../transation/convert/ChargeConvert.java | 16 +++ .../transation/convert/DivideConvert.java | 12 ++ .../convert/DivideDetailConvert.java | 18 +++ .../transation/convert/DivideRuleConvert.java | 12 ++ .../convert/DivideRuleDetailConvert.java | 15 +++ .../transation}/convert/WithdrawConvert.java | 8 +- .../transation}/domain/bo/ChargeBO.java | 5 +- .../soopin/transation/domain/bo/DivideBO.java | 83 ++++++++++++++ .../transation/domain/bo/DivideDetailBO.java | 106 +++++++++++++++++ .../transation/domain/bo/DivideRuleBO.java | 62 ++++++++++ .../domain/bo/DivideRuleDetailBO.java | 60 ++++++++++ .../transation}/domain/bo/WithdrawBO.java | 7 +- .../soopin/transation}/domain/po/Charge.java | 4 +- .../soopin/transation/domain/po/Divide.java | 84 ++++++++++++++ .../transation/domain/po/DivideDetail.java | 107 +++++++++++++++++ .../transation/domain/po/DivideRule.java | 63 ++++++++++ .../domain/po/DivideRuleDetail.java | 61 ++++++++++ .../transation}/domain/po/Withdraw.java | 5 +- .../transation}/domain/vo/ChargeVO.java | 3 +- .../transation/domain/vo/DivideDetailVO.java | 105 +++++++++++++++++ .../domain/vo/DivideRuleDetailVO.java | 59 ++++++++++ .../transation/domain/vo/DivideRuleVO.java | 61 ++++++++++ .../soopin/transation/domain/vo/DivideVO.java | 82 +++++++++++++ .../transation}/domain/vo/WithdrawVO.java | 5 +- .../domain/vo/YishengAccountVO.java | 37 ++++++ .../enums/WithdrawAuditStatus.java | 2 +- .../transation}/enums/WithdrawStatus.java | 2 +- .../transation}/mapper/ChargeMapper.java | 5 +- .../transation/mapper/DivideDetailMapper.java | 14 +++ .../transation/mapper/DivideMapper.java | 13 +++ .../mapper/DivideRuleDetailMapper.java | 14 +++ .../transation/mapper/DivideRuleMapper.java | 14 +++ .../transation/mapper/WithdrawMapper.java | 8 ++ .../transation}/service/IChargeService.java | 5 +- .../service/IDivideDetailService.java | 9 ++ .../service/IDivideRuleDetailService.java | 9 ++ .../service/IDivideRuleService.java | 9 ++ .../transation/service/IDivideService.java | 8 ++ .../transation/service/IWithdrawService.java | 11 ++ .../transation/service/IYishengService.java | 52 +++++++++ .../service/impl/ChargeServiceImpl.java | 11 +- .../service/impl/DivideDetailServiceImpl.java | 24 ++++ .../impl/DivideRuleDetailServiceImpl.java | 24 ++++ .../service/impl/DivideRuleServiceImpl.java | 24 ++++ .../service/impl/DivideServiceImpl.java | 21 ++++ .../service/impl/WithdrawServiceImpl.java | 19 ++- .../service/impl/YishengServiceImpl.java | 31 +++-- 66 files changed, 1656 insertions(+), 201 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/ChargeConvert.java delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/YishengAccountVO.java delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/WithdrawMapper.java delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IWithdrawService.java delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IYishengService.java create mode 100644 ruoyi-modules/ruoyi-transaction/pom.xml rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/controller/ChargeController.java (76%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/controller/WithdrawController.java (74%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/convert/WithdrawConvert.java (56%) rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/domain/bo/ChargeBO.java (93%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/domain/bo/WithdrawBO.java (89%) rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/domain/po/Charge.java (94%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/domain/po/Withdraw.java (91%) rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/domain/vo/ChargeVO.java (96%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/domain/vo/WithdrawVO.java (94%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/enums/WithdrawAuditStatus.java (91%) rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/enums/WithdrawStatus.java (91%) rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/mapper/ChargeMapper.java (56%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/service/IChargeService.java (55%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/service/impl/ChargeServiceImpl.java (63%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/service/impl/WithdrawServiceImpl.java (89%) rename ruoyi-modules/{ruoyi-member/src/main/java/com/wzj/soopin/member => ruoyi-transaction/src/main/java/com/wzj/soopin/transation}/service/impl/YishengServiceImpl.java (54%) diff --git a/pom.xml b/pom.xml index edc5d2aec..ebc2af323 100644 --- a/pom.xml +++ b/pom.xml @@ -370,7 +370,12 @@ ${revision} - + + + org.dromara + ruoyi-transaction + ${revision} + org.dromara @@ -440,6 +445,7 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} + @@ -501,7 +507,7 @@ -Dfile.encoding=UTF-8 - ${profiles.active} + dev exclude diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 0c58f9ef0..2b15e8609 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -107,6 +107,12 @@ ruoyi-workflow + + + org.dromara + ruoyi-transaction + + de.codecentric diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java index 03a628ad9..964f2bb76 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java @@ -58,7 +58,7 @@ public class CaptchaController { */ // @RateLimiter(key = "#phonenumber", time = 60, count = 1) @GetMapping("/resource/sms/code") - public R smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { + public R smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber; String code = RandomUtil.randomNumbers(4); RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); @@ -72,7 +72,7 @@ public class CaptchaController { // log.error("验证码短信发送异常 => {}", smsResponse); // return R.fail(smsResponse.getData().toString()); // } - return R.ok(); + return R.ok(code); } /** diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml index 70ea80832..1cc2a370a 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml +++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml @@ -2,9 +2,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: root - password: 123 + url: jdbc:mysql://82.156.121.2:23306/wzj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: wzj + password: A085F27A43B0 hikari: connection-timeout: 30000 validation-timeout: 5000 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index ffd1dc24f..341099bdf 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -21,6 +21,7 @@ ruoyi-content ruoyi-im ruoyi-auth + ruoyi-transaction ruoyi-modules diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index dc5f0c417..fb409828e 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -378,6 +378,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { } @Override + + public Map getVlogStatistics(String fileId) { Map result = new HashMap<>(); diff --git a/ruoyi-modules/ruoyi-member/pom.xml b/ruoyi-modules/ruoyi-member/pom.xml index 84c541590..4bd40fbc6 100644 --- a/ruoyi-modules/ruoyi-member/pom.xml +++ b/ruoyi-modules/ruoyi-member/pom.xml @@ -21,6 +21,7 @@ ruoyi-common-core + org.dromara ruoyi-common-doc @@ -98,21 +99,22 @@ org.dromara ruoyi-common-sse + - + - + - + diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java index bd5a9f58e..7bd60afdf 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java @@ -3,6 +3,7 @@ package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.wzj.soopin.content.service.VlogService; import com.wzj.soopin.member.convert.FeedbackConvert; import com.wzj.soopin.member.convert.MemberConvert; import com.wzj.soopin.member.domain.bo.FeedbackBO; @@ -40,6 +41,8 @@ public class FeedbackController { private final IMemberService memberService; +// private final VlogService vlogService; + @Tag(name = "查询意见反馈列表") @PostMapping("/list") diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/ChargeConvert.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/ChargeConvert.java deleted file mode 100644 index 5616731ef..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/ChargeConvert.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.wzj.soopin.member.convert; - -import com.wzj.soopin.member.domain.bo.ChargeBO; -import com.wzj.soopin.member.domain.bo.FansBO; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.po.Fans; -import com.wzj.soopin.member.domain.vo.ChargeVO; -import com.wzj.soopin.member.domain.vo.FansVO; -import org.dromara.common.web.core.BaseConverter; -import org.mapstruct.Mapper; - -/** - * 充值 - * - * @author zcc - */ -@Mapper(componentModel = "spring",uses = BaseConverter.class) -public interface ChargeConvert extends BaseConverter { -} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/YishengAccountVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/YishengAccountVO.java deleted file mode 100644 index 570071dcd..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/YishengAccountVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.wzj.soopin.member.domain.vo; - - -import com.alibaba.excel.annotation.ExcelProperty; -import com.wzj.soopin.member.annotation.MemberFillField; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; -import org.dromara.common.core.domain.model.BaseAudit; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 易生平台账户信息 - * - * @author wzj - * @date 2023-03-07 - */ -@Schema(description="易生") -@Data -@Builder(toBuilder = true) -public class YishengAccountVO extends BaseAudit { - - /** - * 主键 - */ - @Schema(description ="主键") - @ExcelProperty(value = "主键", order = 1) - private Long id; - - /** - * 会员id - */ - @Schema(description ="会员id") - @ExcelProperty(value ="会员id", order = 3) - private Long memberId; - - - /** - * 金额 - */ - @Schema(description ="金额") - @ExcelProperty(value ="金额", order = 4) - private BigDecimal balance; - - -} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/WithdrawMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/WithdrawMapper.java deleted file mode 100644 index cd8de3c45..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/WithdrawMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.wzj.soopin.member.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.member.domain.po.Withdraw; -import org.apache.ibatis.annotations.Select; - -public interface WithdrawMapper extends BaseMapper { - -} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IWithdrawService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IWithdrawService.java deleted file mode 100644 index c666c6132..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IWithdrawService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wzj.soopin.member.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.member.domain.bo.WithdrawBO; -import com.wzj.soopin.member.domain.po.Feedback; -import com.wzj.soopin.member.domain.po.Withdraw; -import com.wzj.soopin.member.domain.vo.FeedbackVO; - -import java.io.Serializable; - -public interface IWithdrawService extends IService { - boolean audit(WithdrawBO bo); - - boolean withdraw(Long id); -} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IYishengService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IYishengService.java deleted file mode 100644 index 50dd109da..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IYishengService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.wzj.soopin.member.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.member.domain.po.Withdraw; -import com.wzj.soopin.member.domain.vo.YishengAccountVO; - -import java.math.BigDecimal; - -/** - * 易生支付的service - */ -public interface IYishengService { - YishengAccountVO getYishengAccount(Long memberId); - - boolean withdraw(Long memberId, BigDecimal money); - - - boolean syncMemberAccount(); -} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java index 032c206ec..5aebaad54 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java @@ -26,6 +26,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.redis.redis.RedisCache; import org.dromara.common.satoken.utils.LoginHelper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.scheduling.annotation.Scheduled; @@ -66,7 +67,7 @@ public class MemberServiceImpl extends ServiceImpl implemen @Override - @CachePut(value = CacheConstants.MEMBER, key = "#id") + @CacheEvict(value = CacheConstants.MEMBER, key = "#id") public boolean save(Member entity) { super.save(entity); @@ -95,8 +96,7 @@ public class MemberServiceImpl extends ServiceImpl implemen return true; } - @CachePut(value = CacheConstants.MEMBER, key = "#id") - + @CacheEvict(value = CacheConstants.MEMBER, key = "#id") public int updateMark(MemberBO member) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("mark",member.getMark()) @@ -107,6 +107,7 @@ public class MemberServiceImpl extends ServiceImpl implemen + @CacheEvict(value = CacheConstants.MEMBER, key = "#id") public Integer changeStatus(MemberBO bo) { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id", bo.getId()); @@ -251,13 +252,14 @@ public class MemberServiceImpl extends ServiceImpl implemen @Override -// @Cacheable (cacheNames = CacheConstants.MEMBER, key = "#id") + public Member getById(Serializable id) { return super.getById(id); } @Override + @Cacheable (cacheNames = CacheConstants.MEMBER, key = "#id") public MemberVO getMemberInfo(Serializable id) { return memberConvert.toVO(getById(id)); } diff --git a/ruoyi-modules/ruoyi-transaction/pom.xml b/ruoyi-modules/ruoyi-transaction/pom.xml new file mode 100644 index 000000000..583de9996 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/pom.xml @@ -0,0 +1,108 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + + 4.0.0 + + ruoyi-transaction + + + 交易模块 + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-translation + + + + + org.dromara + ruoyi-common-oss + + + + org.dromara + ruoyi-common-log + + + + + org.dromara + ruoyi-common-excel + + + + + org.dromara + ruoyi-common-sms + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + org.dromara + ruoyi-common-websocket + + + + org.dromara + ruoyi-order + + + org.dromara + ruoyi-member + + + diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/ChargeController.java similarity index 76% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/ChargeController.java index 15c4af9ca..bc731fdd5 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/ChargeController.java @@ -1,18 +1,13 @@ -package com.wzj.soopin.member.controller; +package com.wzj.soopin.transation.controller; import com.baomidou.mybatisplus.core.metadata.IPage; 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.MemberForbiddenConvert; -import com.wzj.soopin.member.domain.bo.ChargeBO; -import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.po.MemberForbidden; -import com.wzj.soopin.member.domain.vo.ChargeVO; -import com.wzj.soopin.member.domain.vo.MemberForbiddenVO; -import com.wzj.soopin.member.service.IChargeService; -import com.wzj.soopin.member.service.IMemberForbiddenService; +import com.wzj.soopin.transation.convert.ChargeConvert; +import com.wzj.soopin.transation.domain.bo.ChargeBO; +import com.wzj.soopin.transation.domain.po.Charge; +import com.wzj.soopin.transation.domain.vo.ChargeVO; +import com.wzj.soopin.transation.service.IChargeService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -25,7 +20,7 @@ import org.springframework.web.bind.annotation.*; */ @Tag(name = "用户封禁") @RestController -@RequestMapping("/ums/charge") +@RequestMapping("/trans/charge") @RequiredArgsConstructor public class ChargeController { diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java new file mode 100644 index 000000000..e202de89b --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java @@ -0,0 +1,64 @@ +package com.wzj.soopin.transation.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.transation.convert.DivideConvert; +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transation.service.IDivideService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.springframework.web.bind.annotation.*; + +/** + * 用户封禁 + */ +@Tag(name = "分账") +@RestController +@RequestMapping("/trans/divide") +@RequiredArgsConstructor +public class DivideController { + + private final IDivideService service; + private final DivideConvert convert; + + @Tag(name = "查询列表") + @PostMapping("/list") + public R> list(@RequestBody DivideBO bo, @RequestBody Page page) { + Page pages = service.page(page, bo.toWrapper()); + return R.ok(convert.toVO(pages)); + } + + @Tag(name = "新增") + @Log(title = "新增 ", businessType = BusinessType.INSERT) + @PostMapping("/add") + public R add(@RequestBody DivideBO bo) { + return R.ok(service.save(convert.toPo(bo))); + } + + @Tag(name = "详情") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(convert.toVO(service.getById(id))); + } + + @Tag(name = ("回调更新")) + @Log(title = "回调更新", businessType = BusinessType.UPDATE) + @PostMapping("/callback") + public R callback(@RequestBody DivideBO bo) { + service.save(convert.toPo(bo)); + return R.ok(); + } + + + @Tag(name = "删除") + @Log(title = "删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public R remove(@PathVariable Long id) { + return R.ok(service.removeById(id)); + } +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java new file mode 100644 index 000000000..30e10a537 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java @@ -0,0 +1,78 @@ +package com.wzj.soopin.transation.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.transation.convert.DivideConvert; +import com.wzj.soopin.transation.convert.DivideRuleConvert; +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.bo.DivideRuleBO; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transation.service.IDivideRuleService; +import com.wzj.soopin.transation.service.IDivideService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.springframework.web.bind.annotation.*; + +/** + * 用户封禁 + */ +@Tag(name = "分账") +@RestController +@RequestMapping("/trans/divide/rule") +@RequiredArgsConstructor +public class DivideRuleController { + + private final IDivideRuleService service; + private final DivideRuleConvert convert; + + @Tag(name = "查询列表") + @PostMapping("/list") + public R> list(@RequestBody DivideRuleBO bo, @RequestBody Page page) { + Page pages = service.page(page, bo.toWrapper()); + return R.ok(convert.toVO(pages)); + } + + @Tag(name = "新增") + @Log(title = "新增 ", businessType = BusinessType.INSERT) + @PostMapping("/add") + public R add(@RequestBody DivideRuleBO bo) { + return R.ok(service.save(convert.toPo(bo))); + } + + @Tag(name = "详情") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(convert.toVO(service.getById(id))); + } + + @Tag(name = ("修改")) + @Log(title = "修改", businessType = BusinessType.UPDATE) + @PostMapping("/update") + public R update(@RequestBody DivideRuleBO bo) { + service.save(convert.toPo(bo)); + return R.ok(); + } + + @Tag(name = ("启用停用")) + @Log(title = "启用停用", businessType = BusinessType.UPDATE) + @PostMapping("/change") + public R change(@RequestBody DivideRuleBO bo) { + service.save(convert.toPo(bo)); + return R.ok(); + } + + + + @Tag(name = "删除") + @Log(title = "删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{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/WithdrawController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/WithdrawController.java similarity index 74% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/WithdrawController.java index 02a78dcf7..f814504c2 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/WithdrawController.java @@ -1,18 +1,13 @@ -package com.wzj.soopin.member.controller; +package com.wzj.soopin.transation.controller; import com.baomidou.mybatisplus.core.metadata.IPage; 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.WithdrawConvert; -import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; -import com.wzj.soopin.member.domain.bo.WithdrawBO; -import com.wzj.soopin.member.domain.po.MemberForbidden; -import com.wzj.soopin.member.domain.po.Withdraw; -import com.wzj.soopin.member.domain.vo.MemberForbiddenVO; -import com.wzj.soopin.member.domain.vo.WithdrawVO; -import com.wzj.soopin.member.service.IMemberForbiddenService; -import com.wzj.soopin.member.service.IWithdrawService; +import com.wzj.soopin.transation.convert.WithdrawConvert; +import com.wzj.soopin.transation.domain.bo.WithdrawBO; +import com.wzj.soopin.transation.domain.po.Withdraw; +import com.wzj.soopin.transation.domain.vo.WithdrawVO; +import com.wzj.soopin.transation.service.IWithdrawService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -25,7 +20,7 @@ import org.springframework.web.bind.annotation.*; */ @Tag(name = "提现") @RestController -@RequestMapping("/ums/withdraw") +@RequestMapping("/trans/withdraw") @RequiredArgsConstructor public class WithdrawController { diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java new file mode 100644 index 000000000..8bc43607d --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java @@ -0,0 +1,16 @@ +package com.wzj.soopin.transation.convert; + +import com.wzj.soopin.transation.domain.bo.ChargeBO; +import com.wzj.soopin.transation.domain.po.Charge; +import com.wzj.soopin.transation.domain.vo.ChargeVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +/** + * 充值 + * + * @author zcc + */ +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface ChargeConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java new file mode 100644 index 000000000..e8e665019 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java @@ -0,0 +1,12 @@ +package com.wzj.soopin.transation.convert; + + +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface DivideConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java new file mode 100644 index 000000000..ed2d5f53c --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java @@ -0,0 +1,18 @@ +package com.wzj.soopin.transation.convert; + + +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.bo.DivideDetailBO; +import com.wzj.soopin.transation.domain.bo.DivideRuleBO; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideDetail; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.vo.DivideDetailVO; +import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface DivideDetailConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java new file mode 100644 index 000000000..499baf7e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java @@ -0,0 +1,12 @@ +package com.wzj.soopin.transation.convert; + + +import com.wzj.soopin.transation.domain.bo.DivideRuleBO; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface DivideRuleConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java new file mode 100644 index 000000000..034fff100 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java @@ -0,0 +1,15 @@ +package com.wzj.soopin.transation.convert; + + +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.bo.DivideRuleDetailBO; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideRuleDetail; +import com.wzj.soopin.transation.domain.vo.DivideRuleDetailVO; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface DivideRuleDetailConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/WithdrawConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/WithdrawConvert.java similarity index 56% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/WithdrawConvert.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/WithdrawConvert.java index 3abb98d77..49dcc88b6 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/WithdrawConvert.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/WithdrawConvert.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.member.convert; +package com.wzj.soopin.transation.convert; -import com.wzj.soopin.member.domain.bo.WithdrawBO; -import com.wzj.soopin.member.domain.po.Withdraw; -import com.wzj.soopin.member.domain.vo.WithdrawVO; +import com.wzj.soopin.transation.domain.bo.WithdrawBO; +import com.wzj.soopin.transation.domain.po.Withdraw; +import com.wzj.soopin.transation.domain.vo.WithdrawVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/ChargeBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/ChargeBO.java similarity index 93% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/ChargeBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/ChargeBO.java index 3182146d5..e02c272b7 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/ChargeBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/ChargeBO.java @@ -1,9 +1,8 @@ -package com.wzj.soopin.member.domain.bo; +package com.wzj.soopin.transation.domain.bo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.po.Withdraw; +import com.wzj.soopin.transation.domain.po.Charge; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java new file mode 100644 index 000000000..c7343fc05 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java @@ -0,0 +1,83 @@ +package com.wzj.soopin.transation.domain.bo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.wzj.soopin.transation.domain.po.Divide; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +import java.math.BigDecimal; + +/** + * 订单分账 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description = "订单分账") +@Data +public class DivideBO extends BaseBO { + + /** + * 主键 + */ + @Schema(description = "主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 分账规则id + */ + @Schema(description = "分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + + + + /** + * 金额 + */ + @Schema(description = "订单总金额") + @ExcelProperty(value = "订单总金额", order = 4) + private BigDecimal orderMoney; + + /** + * 手续费 + */ + @Schema(description = "手续费") + @ExcelProperty(value = "手续费", order = 5) + private BigDecimal fee; + /** + * 金额分配比例 + */ + @Schema(description = "实际分账金额") + @ExcelProperty(value = "实际分账金额", order = 5) + private BigDecimal actualMoney; + + @Schema(description = "适用订单类型") + private Integer type; + /** + * 状态 + */ + @Schema(description = "状态") + @ExcelProperty(value = "状态", order = 5) + private Integer status; + + + /** + * 订单id + * */ + @Schema(description = "订单id") + @ExcelProperty(value = "订单id", order = 8) + private Long orderId; + + /** + * 订单编号 + * */ + @Schema(description = "订单编号") + @ExcelProperty(value = "订单编号", order = 9) + private String orderSn; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java new file mode 100644 index 000000000..cc8afa143 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java @@ -0,0 +1,106 @@ +package com.wzj.soopin.transation.domain.bo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.wzj.soopin.transation.domain.po.DivideDetail; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +import java.math.BigDecimal; + +/** + * 分账规则明细 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description = "订单分账明细") +@Data +public class DivideDetailBO extends BaseBO { + + /** + * 主键 + */ + @Schema(description = "主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 分账规则id + */ + @Schema(description = "分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + + /** + * 分账规则明细id + */ + @Schema(description = "分账规则明细id") + @ExcelProperty(value = "分账规则明细id", order = 3) + private Long ruleDetailId; + + /** + * 金额 + */ + @Schema(description = "金额") + @ExcelProperty(value = "金额", order = 4) + private BigDecimal money; + + /** + * 手续费 + */ + @Schema(description = "手续费") + @ExcelProperty(value = "手续费", order = 5) + private BigDecimal fee; + /** + * 金额分配比例 + */ + @Schema(description = "金额分配比例") + @ExcelProperty(value = "金额分配比例", order = 5) + + private BigDecimal moneyPercent; + /** + * 手续费分配比例 + */ + @Schema(description = "手续费分配比例") + @ExcelProperty(value = "手续费分配比例", order = 5) + + private BigDecimal feePercent; + /** + * 账户类型 1 平台 2 商户 3 代理人 + * */ + + private Integer type; + /** + * 状态 + */ + @Schema(description = "状态") + @ExcelProperty(value = "状态", order = 5) + private Integer status; + + @Schema(description = "账户id") + @ExcelProperty(value = "账户id", order = 6) + private Long accountId; + /** + * 账户名称 + * */ + @Schema(description = "账户名称") + @ExcelProperty(value = "账户名称", order = 7) + private String accountName; + /** + * 订单id + * */ + @Schema(description = "订单id") + @ExcelProperty(value = "订单id", order = 8) + private Long orderId; + + /** + * 订单编号 + * */ + @Schema(description = "订单编号") + @ExcelProperty(value = "订单编号", order = 9) + private String orderSn; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java new file mode 100644 index 000000000..b2e292a2b --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java @@ -0,0 +1,62 @@ +package com.wzj.soopin.transation.domain.bo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.wzj.soopin.transation.domain.po.DivideRule; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +/** + * 分账规则 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description="分账规则") +@Data +public class DivideRuleBO extends BaseBO { + + /** + * 主键 + */ + @Schema(description ="主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 提现码 + */ + + @Schema(description ="编号") + @ExcelProperty(value = "编号", order = 2) + private String code; + + + @Schema(description ="名称") + @ExcelProperty(value ="名称", order = 3) + private String name; + + @Schema(description ="是否分配手续费") + @ExcelProperty(value ="是否分配手续费", order = 4) + private Integer divideFeeFlag; + + @Schema(description ="手续费分配方式") + @ExcelProperty(value ="手续费分配方式", order = 5) + private Integer feeType; + + /** + * 状态 + */ + @Schema(description ="状态") + @ExcelProperty(value ="状态", order = 7) + private Integer status; + /** + * 类型 + */ + @Schema(description ="适用订单类型") + @ExcelProperty(value ="类型", order = 8) + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java new file mode 100644 index 000000000..eb67b0b85 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java @@ -0,0 +1,60 @@ +package com.wzj.soopin.transation.domain.bo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.wzj.soopin.transation.domain.po.DivideRuleDetail; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +import java.math.BigDecimal; + +/** + * 分账规则明细 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description="分账规则明细") +@Data +public class DivideRuleDetailBO extends BaseBO { + + /** + * 主键 + */ + @Schema(description ="主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 提现码 + */ + + @Schema(description ="分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long divideId; + + + @Schema(description ="金额分配比例") + @ExcelProperty(value ="金额分配比例", order = 4) + private BigDecimal moneyPercent; + + @Schema(description ="手续费分配比例") + @ExcelProperty(value ="手续费分配比例", order = 5) + private BigDecimal feePercent; + + /** + * 状态 + */ + @Schema(description ="状态") + @ExcelProperty(value ="状态", order = 7) + private Integer status; + /** + * 类型 + */ + @Schema(description ="账户类型 1 平台 2 商户 3 代理人") + @ExcelProperty(value ="类型", order = 8) + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/WithdrawBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/WithdrawBO.java similarity index 89% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/WithdrawBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/WithdrawBO.java index 6643b3c14..344ee4551 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/WithdrawBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/WithdrawBO.java @@ -1,14 +1,11 @@ -package com.wzj.soopin.member.domain.bo; +package com.wzj.soopin.transation.domain.bo; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wzj.soopin.member.domain.po.Withdraw; +import com.wzj.soopin.transation.domain.po.Withdraw; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; -import org.dromara.common.core.domain.model.BaseAudit; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Charge.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Charge.java similarity index 94% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Charge.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Charge.java index 537a09150..c6a13138b 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Charge.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Charge.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.member.domain.po; +package com.wzj.soopin.transation.domain.po; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -14,7 +14,7 @@ import java.time.LocalDateTime; */ @Schema(description="充值") @Data -@TableName("ums_charge") +@TableName("trans_charge") public class Charge extends BaseAudit { /** diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java new file mode 100644 index 000000000..d06464a66 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java @@ -0,0 +1,84 @@ +package com.wzj.soopin.transation.domain.po; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.math.BigDecimal; + +/** + * 订单分账 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description = "订单分账") +@Data +@TableName("oms_aftersale") +public class Divide extends BaseEntity { + + /** + * 主键 + */ + @Schema(description = "主键") + @ExcelProperty(value = "主键", order = 1) + @TableId + private Long id; + + /** + * 分账规则id + */ + @Schema(description = "分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + + /** + * 金额 + */ + @Schema(description = "订单总金额") + @ExcelProperty(value = "订单总金额", order = 4) + private BigDecimal orderMoney; + + /** + * 手续费 + */ + @Schema(description = "手续费") + @ExcelProperty(value = "手续费", order = 5) + private BigDecimal fee; + /** + * 金额分配比例 + */ + @Schema(description = "实际分账金额") + @ExcelProperty(value = "实际分账金额", order = 5) + private BigDecimal actualMoney; + + + /** + * 状态 + */ + @Schema(description = "状态") + @ExcelProperty(value = "状态", order = 5) + private Integer status; + + + /** + * 订单id + * */ + @Schema(description = "订单id") + @ExcelProperty(value = "订单id", order = 8) + private Long orderId; + + + /** + * 订单编号 + * */ + @Schema(description = "订单编号") + @ExcelProperty(value = "订单编号", order = 9) + private String orderSn; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java new file mode 100644 index 000000000..a444e9a5f --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java @@ -0,0 +1,107 @@ +package com.wzj.soopin.transation.domain.po; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.math.BigDecimal; + +/** + * 分账规则明细 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description = "订单分账明细") +@Data +public class DivideDetail extends BaseEntity { + + /** + * 主键 + */ + @Schema(description = "主键") + @ExcelProperty(value = "主键", order = 1) + @TableId + private Long id; + + /** + * 分账规则id + */ + @Schema(description = "分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + + /** + * 分账规则明细id + */ + @Schema(description = "分账规则明细id") + @ExcelProperty(value = "分账规则明细id", order = 3) + private Long ruleDetailId; + + /** + * 金额 + */ + @Schema(description = "金额") + @ExcelProperty(value = "金额", order = 4) + private BigDecimal money; + + /** + * 手续费 + */ + @Schema(description = "手续费") + @ExcelProperty(value = "手续费", order = 5) + private BigDecimal fee; + /** + * 金额分配比例 + */ + @Schema(description = "金额分配比例") + @ExcelProperty(value = "金额分配比例", order = 5) + + private BigDecimal moneyPercent; + /** + * 手续费分配比例 + */ + @Schema(description = "手续费分配比例") + @ExcelProperty(value = "手续费分配比例", order = 5) + + private BigDecimal feePercent; + /** + * 账户类型 1 平台 2 商户 3 代理人 + * */ + + private Integer type; + /** + * 状态 + */ + @Schema(description = "状态") + @ExcelProperty(value = "状态", order = 5) + private Integer status; + + @Schema(description = "账户id") + @ExcelProperty(value = "账户id", order = 6) + private Long accountId; + /** + * 账户名称 + * */ + @Schema(description = "账户名称") + @ExcelProperty(value = "账户名称", order = 7) + private String accountName; + /** + * 订单id + * */ + @Schema(description = "订单id") + @ExcelProperty(value = "订单id", order = 8) + private Long orderId; + + /** + * 订单编号 + * */ + @Schema(description = "订单编号") + @ExcelProperty(value = "订单编号", order = 9) + private String orderSn; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java new file mode 100644 index 000000000..be5700576 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java @@ -0,0 +1,63 @@ +package com.wzj.soopin.transation.domain.po; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 分账规则 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description="分账规则") +@Data +public class DivideRule extends BaseEntity { + + /** + * 主键 + */ + @Schema(description ="主键") + @ExcelProperty(value = "主键", order = 1) + @TableId + private Long id; + + /** + * 提现码 + */ + + @Schema(description ="编号") + @ExcelProperty(value = "编号", order = 2) + private String code; + + + @Schema(description ="名称") + @ExcelProperty(value ="名称", order = 3) + private String name; + + @Schema(description ="是否分配手续费") + @ExcelProperty(value ="是否分配手续费", order = 4) + private Integer divideFeeFlag; + + @Schema(description ="手续费分配方式") + @ExcelProperty(value ="手续费分配方式", order = 5) + private Integer feeType; + + /** + * 状态 + */ + @Schema(description ="状态") + @ExcelProperty(value ="状态", order = 7) + private Integer status; + /** + * 类型 + */ + @Schema(description ="适用订单类型") + @ExcelProperty(value ="类型", order = 8) + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java new file mode 100644 index 000000000..2531fa209 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java @@ -0,0 +1,61 @@ +package com.wzj.soopin.transation.domain.po; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.math.BigDecimal; + +/** + * 分账规则明细 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description="分账规则明细") +@Data +public class DivideRuleDetail extends BaseEntity { + + /** + * 主键 + */ + @Schema(description ="主键") + @ExcelProperty(value = "主键", order = 1) + @TableId + private Long id; + + /** + * 提现码 + */ + + @Schema(description ="分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long divideId; + + + @Schema(description ="金额分配比例") + @ExcelProperty(value ="金额分配比例", order = 4) + private BigDecimal moneyPercent; + + @Schema(description ="手续费分配比例") + @ExcelProperty(value ="手续费分配比例", order = 5) + private BigDecimal feePercent; + + /** + * 状态 + */ + @Schema(description ="状态") + @ExcelProperty(value ="状态", order = 7) + private Integer status; + /** + * 类型 + */ + @Schema(description ="账户类型 1 平台 2 商户 3 代理人") + @ExcelProperty(value ="类型", order = 8) + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Withdraw.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Withdraw.java similarity index 91% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Withdraw.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Withdraw.java index b56f92bae..48850dec7 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Withdraw.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Withdraw.java @@ -1,7 +1,6 @@ -package com.wzj.soopin.member.domain.po; +package com.wzj.soopin.transation.domain.po; -import com.alibaba.excel.annotation.format.DateTimeFormat; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; */ @Schema(description="提现") @Data -@TableName("ums_withdraw") +@TableName("trans_withdraw") @Builder(toBuilder = true) public class Withdraw extends BaseAudit { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/ChargeVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java similarity index 96% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/ChargeVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java index 2a1787ae4..0ce4197e2 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/ChargeVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java @@ -1,8 +1,9 @@ -package com.wzj.soopin.member.domain.vo; +package com.wzj.soopin.transation.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.wzj.soopin.member.annotation.MemberFillField; +import com.wzj.soopin.member.domain.vo.MemberVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java new file mode 100644 index 000000000..be35356ba --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java @@ -0,0 +1,105 @@ +package com.wzj.soopin.transation.domain.vo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +import java.math.BigDecimal; + +/** + * 分账规则明细 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description = "订单分账明细") +@Data +public class DivideDetailVO extends BaseAudit { + + /** + * 主键 + */ + @Schema(description = "主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 分账规则id + */ + @Schema(description = "分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + + /** + * 分账规则明细id + */ + @Schema(description = "分账规则明细id") + @ExcelProperty(value = "分账规则明细id", order = 3) + private Long ruleDetailId; + + /** + * 金额 + */ + @Schema(description = "金额") + @ExcelProperty(value = "金额", order = 4) + private BigDecimal money; + + /** + * 手续费 + */ + @Schema(description = "手续费") + @ExcelProperty(value = "手续费", order = 5) + private BigDecimal fee; + /** + * 金额分配比例 + */ + @Schema(description = "金额分配比例") + @ExcelProperty(value = "金额分配比例", order = 5) + + private BigDecimal moneyPercent; + /** + * 手续费分配比例 + */ + @Schema(description = "手续费分配比例") + @ExcelProperty(value = "手续费分配比例", order = 5) + + private BigDecimal feePercent; + /** + * 账户类型 1 平台 2 商户 3 代理人 + * */ + + private Integer type; + /** + * 状态 + */ + @Schema(description = "状态") + @ExcelProperty(value = "状态", order = 5) + private Integer status; + + @Schema(description = "账户id") + @ExcelProperty(value = "账户id", order = 6) + private Long accountId; + /** + * 账户名称 + * */ + @Schema(description = "账户名称") + @ExcelProperty(value = "账户名称", order = 7) + private String accountName; + /** + * 订单id + * */ + @Schema(description = "订单id") + @ExcelProperty(value = "订单id", order = 8) + private Long orderId; + + /** + * 订单编号 + * */ + @Schema(description = "订单编号") + @ExcelProperty(value = "订单编号", order = 9) + private String orderSn; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java new file mode 100644 index 000000000..34f0d7ab5 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java @@ -0,0 +1,59 @@ +package com.wzj.soopin.transation.domain.vo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +import java.math.BigDecimal; + +/** + * 分账规则明细 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description="分账规则明细") +@Data +public class DivideRuleDetailVO extends BaseAudit { + + /** + * 主键 + */ + @Schema(description ="主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 提现码 + */ + + @Schema(description ="分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long divideId; + + + @Schema(description ="金额分配比例") + @ExcelProperty(value ="金额分配比例", order = 4) + private BigDecimal moneyPercent; + + @Schema(description ="手续费分配比例") + @ExcelProperty(value ="手续费分配比例", order = 5) + private BigDecimal feePercent; + + /** + * 状态 + */ + @Schema(description ="状态") + @ExcelProperty(value ="状态", order = 7) + private Integer status; + /** + * 类型 + */ + @Schema(description ="账户类型 1 平台 2 商户 3 代理人") + @ExcelProperty(value ="类型", order = 8) + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java new file mode 100644 index 000000000..380286328 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java @@ -0,0 +1,61 @@ +package com.wzj.soopin.transation.domain.vo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +/** + * 分账规则 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description="分账规则") +@Data +public class DivideRuleVO extends BaseAudit { + + /** + * 主键 + */ + @Schema(description ="主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 提现码 + */ + + @Schema(description ="编号") + @ExcelProperty(value = "编号", order = 2) + private String code; + + + @Schema(description ="名称") + @ExcelProperty(value ="名称", order = 3) + private String name; + + @Schema(description ="是否分配手续费") + @ExcelProperty(value ="是否分配手续费", order = 4) + private Integer divideFeeFlag; + + @Schema(description ="手续费分配方式") + @ExcelProperty(value ="手续费分配方式", order = 5) + private Integer feeType; + + /** + * 状态 + */ + @Schema(description ="状态") + @ExcelProperty(value ="状态", order = 7) + private Integer status; + /** + * 类型 + */ + @Schema(description ="适用订单类型") + @ExcelProperty(value ="类型", order = 8) + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java new file mode 100644 index 000000000..3658137e1 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java @@ -0,0 +1,82 @@ +package com.wzj.soopin.transation.domain.vo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +import java.math.BigDecimal; + +/** + * 订单分账 + * + * @author wzj + * @date 2023-03-07 + */ +@Schema(description = "订单分账") +@Data +public class DivideVO extends BaseAudit { + + /** + * 主键 + */ + @Schema(description = "主键") + @ExcelProperty(value = "主键", order = 1) + private Long id; + + /** + * 分账规则id + */ + @Schema(description = "分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + + + + /** + * 金额 + */ + @Schema(description = "订单总金额") + @ExcelProperty(value = "订单总金额", order = 4) + private BigDecimal orderMoney; + + /** + * 手续费 + */ + @Schema(description = "手续费") + @ExcelProperty(value = "手续费", order = 5) + private BigDecimal fee; + /** + * 金额分配比例 + */ + @Schema(description = "实际分账金额") + @ExcelProperty(value = "实际分账金额", order = 5) + private BigDecimal actualMoney; + + @Schema(description = "适用订单类型") + private Integer type; + /** + * 状态 + */ + @Schema(description = "状态") + @ExcelProperty(value = "状态", order = 5) + private Integer status; + + + /** + * 订单id + * */ + @Schema(description = "订单id") + @ExcelProperty(value = "订单id", order = 8) + private Long orderId; + + /** + * 订单编号 + * */ + @Schema(description = "订单编号") + @ExcelProperty(value = "订单编号", order = 9) + private String orderSn; + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/WithdrawVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java similarity index 94% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/WithdrawVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java index eb24ade16..85f960b51 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/WithdrawVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java @@ -1,10 +1,9 @@ -package com.wzj.soopin.member.domain.vo; +package com.wzj.soopin.transation.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.wzj.soopin.member.annotation.MemberFillField; +import com.wzj.soopin.member.domain.vo.MemberVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java new file mode 100644 index 000000000..52599ef7f --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java @@ -0,0 +1,37 @@ +package com.wzj.soopin.transation.domain.vo; + + + +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 易生平台账户信息 + * + * @author wzj + * @date 2023-03-07 + */ +@Builder(toBuilder = true) +@Data +public class YishengAccountVO { + + /** + * 主键 + */ + private Long id; + + /** + * 会员id + */ + private Long memberId; + + + /** + * 金额 + */ + private BigDecimal balance; + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/WithdrawAuditStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawAuditStatus.java similarity index 91% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/WithdrawAuditStatus.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawAuditStatus.java index 8f9cb8fd2..0b0f838fb 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/WithdrawAuditStatus.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawAuditStatus.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.member.enums; +package com.wzj.soopin.transation.enums; public enum WithdrawAuditStatus { PENDING(0, "待审核"), diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/WithdrawStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawStatus.java similarity index 91% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/WithdrawStatus.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawStatus.java index b99979231..ef50e35c1 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/WithdrawStatus.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawStatus.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.member.enums; +package com.wzj.soopin.transation.enums; public enum WithdrawStatus { WAITING(0, "等待转账"), diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/ChargeMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/ChargeMapper.java similarity index 56% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/ChargeMapper.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/ChargeMapper.java index 442ca5ddc..a190fddc2 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/ChargeMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/ChargeMapper.java @@ -1,8 +1,7 @@ -package com.wzj.soopin.member.mapper; +package com.wzj.soopin.transation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.po.Withdraw; +import com.wzj.soopin.transation.domain.po.Charge; /** * 意见反馈Mapper接口 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java new file mode 100644 index 000000000..d566fd9f9 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.transation.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideDetail; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideDetailMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java new file mode 100644 index 000000000..847c37c67 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java @@ -0,0 +1,13 @@ +package com.wzj.soopin.transation.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.transation.domain.po.Divide; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java new file mode 100644 index 000000000..7866e9bbe --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.transation.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.po.DivideRuleDetail; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideRuleDetailMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java new file mode 100644 index 000000000..ef292868f --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.transation.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideRule; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideRuleMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java new file mode 100644 index 000000000..87ef08f2d --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java @@ -0,0 +1,8 @@ +package com.wzj.soopin.transation.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.transation.domain.po.Withdraw; + +public interface WithdrawMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IChargeService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IChargeService.java similarity index 55% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IChargeService.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IChargeService.java index ca41a598c..ce3f96462 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IChargeService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IChargeService.java @@ -1,8 +1,7 @@ -package com.wzj.soopin.member.service; +package com.wzj.soopin.transation.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.po.Withdraw; +import com.wzj.soopin.transation.domain.po.Charge; public interface IChargeService extends IService { diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java new file mode 100644 index 000000000..49d53012d --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java @@ -0,0 +1,9 @@ +package com.wzj.soopin.transation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideDetail; + +public interface IDivideDetailService extends IService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java new file mode 100644 index 000000000..e39123baf --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java @@ -0,0 +1,9 @@ +package com.wzj.soopin.transation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.po.DivideRuleDetail; + +public interface IDivideRuleDetailService extends IService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java new file mode 100644 index 000000000..baaf56a30 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java @@ -0,0 +1,9 @@ +package com.wzj.soopin.transation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideRule; + +public interface IDivideRuleService extends IService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java new file mode 100644 index 000000000..acbe7fe34 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java @@ -0,0 +1,8 @@ +package com.wzj.soopin.transation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.po.Divide; + +public interface IDivideService extends IService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java new file mode 100644 index 000000000..ca007d2c6 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java @@ -0,0 +1,11 @@ +package com.wzj.soopin.transation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.bo.WithdrawBO; +import com.wzj.soopin.transation.domain.po.Withdraw; + +public interface IWithdrawService extends IService { + boolean audit(WithdrawBO bo); + + boolean withdraw(Long id); +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java new file mode 100644 index 000000000..e34971b72 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java @@ -0,0 +1,52 @@ +package com.wzj.soopin.transation.service; + + +import com.wzj.soopin.transation.domain.vo.YishengAccountVO; + +import java.math.BigDecimal; + +public interface IYishengService { + /** + * 获取易生账户 + * @param memberId + * @return + */ + YishengAccountVO getYishengAccount(Long memberId); + + /** + * 提现 + * @param memberId + * @param money + * @return + */ + boolean withdraw(Long memberId, BigDecimal money); + + + /** + * 同步会员账户 + * @return + */ + boolean syncMemberAccount(); + + /** + * 开通商户 + */ + void openMerchant(Long memberId); + + /** + * 获取商户账户 + */ + YishengAccountVO getMerchantAccount(Long memberId); + + /** + * 分账 + */ + boolean split(Long memberId, BigDecimal money); + + + /** + * 商户审核通知 + * */ + + boolean merchantAuditNotice(String request); +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/ChargeServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/ChargeServiceImpl.java similarity index 63% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/ChargeServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/ChargeServiceImpl.java index c40cb76d8..8b7cceda3 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/ChargeServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/ChargeServiceImpl.java @@ -1,12 +1,9 @@ -package com.wzj.soopin.member.service.impl; +package com.wzj.soopin.transation.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.po.MemberForbidden; -import com.wzj.soopin.member.mapper.ChargeMapper; -import com.wzj.soopin.member.mapper.MemberForbiddenMapper; -import com.wzj.soopin.member.service.IChargeService; -import com.wzj.soopin.member.service.IMemberForbiddenService; +import com.wzj.soopin.transation.domain.po.Charge; +import com.wzj.soopin.transation.mapper.ChargeMapper; +import com.wzj.soopin.transation.service.IChargeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java new file mode 100644 index 000000000..4b725b747 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java @@ -0,0 +1,24 @@ +package com.wzj.soopin.transation.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideDetail; +import com.wzj.soopin.transation.mapper.DivideDetailMapper; +import com.wzj.soopin.transation.mapper.DivideMapper; +import com.wzj.soopin.transation.service.IDivideDetailService; +import com.wzj.soopin.transation.service.IDivideService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 分账服务实现类 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class DivideDetailServiceImpl extends ServiceImpl implements IDivideDetailService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java new file mode 100644 index 000000000..ea10cba6b --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java @@ -0,0 +1,24 @@ +package com.wzj.soopin.transation.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideRuleDetail; +import com.wzj.soopin.transation.mapper.DivideMapper; +import com.wzj.soopin.transation.mapper.DivideRuleDetailMapper; +import com.wzj.soopin.transation.service.IDivideRuleDetailService; +import com.wzj.soopin.transation.service.IDivideService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 分账服务实现类 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class DivideRuleDetailServiceImpl extends ServiceImpl implements IDivideRuleDetailService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java new file mode 100644 index 000000000..b7b511253 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java @@ -0,0 +1,24 @@ +package com.wzj.soopin.transation.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.mapper.DivideMapper; +import com.wzj.soopin.transation.mapper.DivideRuleMapper; +import com.wzj.soopin.transation.service.IDivideRuleService; +import com.wzj.soopin.transation.service.IDivideService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 分账服务实现类 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class DivideRuleServiceImpl extends ServiceImpl implements IDivideRuleService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java new file mode 100644 index 000000000..7145ca21d --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java @@ -0,0 +1,21 @@ +package com.wzj.soopin.transation.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.mapper.DivideMapper; +import com.wzj.soopin.transation.service.IDivideService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 分账服务实现类 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class DivideServiceImpl extends ServiceImpl implements IDivideService { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/WithdrawServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/WithdrawServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/WithdrawServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/WithdrawServiceImpl.java index d91f25422..21f54b4dd 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/WithdrawServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/WithdrawServiceImpl.java @@ -1,20 +1,19 @@ -package com.wzj.soopin.member.service.impl; +package com.wzj.soopin.transation.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.member.domain.bo.WithdrawBO; -import com.wzj.soopin.member.domain.po.Charge; +import com.wzj.soopin.transation.domain.bo.WithdrawBO; import com.wzj.soopin.member.domain.po.MemberAccount; import com.wzj.soopin.member.domain.po.MemberAccountChangeRecord; -import com.wzj.soopin.member.domain.po.Withdraw; -import com.wzj.soopin.member.domain.vo.YishengAccountVO; +import com.wzj.soopin.transation.domain.po.Withdraw; import com.wzj.soopin.member.enums.MemberAccountChangeRecordChangeTypeEnum; import com.wzj.soopin.member.enums.MemberAccountChangeRecordSourceEnum; -import com.wzj.soopin.member.enums.WithdrawAuditStatus; -import com.wzj.soopin.member.enums.WithdrawStatus; -import com.wzj.soopin.member.mapper.ChargeMapper; -import com.wzj.soopin.member.mapper.MemberAccountMapper; -import com.wzj.soopin.member.mapper.WithdrawMapper; +import com.wzj.soopin.transation.enums.WithdrawAuditStatus; +import com.wzj.soopin.transation.enums.WithdrawStatus; +import com.wzj.soopin.transation.mapper.WithdrawMapper; import com.wzj.soopin.member.service.*; +import com.wzj.soopin.transation.domain.vo.YishengAccountVO; +import com.wzj.soopin.transation.service.IWithdrawService; +import com.wzj.soopin.transation.service.IYishengService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.satoken.utils.LoginHelper; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/YishengServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/YishengServiceImpl.java similarity index 54% rename from ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/YishengServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/YishengServiceImpl.java index d34b5005a..74908a2eb 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/YishengServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/YishengServiceImpl.java @@ -1,11 +1,8 @@ -package com.wzj.soopin.member.service.impl; +package com.wzj.soopin.transation.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.member.domain.po.Charge; -import com.wzj.soopin.member.domain.vo.YishengAccountVO; -import com.wzj.soopin.member.mapper.ChargeMapper; -import com.wzj.soopin.member.service.IChargeService; -import com.wzj.soopin.member.service.IYishengService; + +import com.wzj.soopin.transation.domain.vo.YishengAccountVO; +import com.wzj.soopin.transation.service.IYishengService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -37,4 +34,24 @@ public class YishengServiceImpl implements IYishengService { public boolean syncMemberAccount() { return true; } + + @Override + public void openMerchant(Long memberId) { + + } + + @Override + public YishengAccountVO getMerchantAccount(Long memberId) { + return null; + } + + @Override + public boolean split(Long memberId, BigDecimal money) { + return false; + } + + @Override + public boolean merchantAuditNotice(String request) { + return false; + } } From ee14312dcd9204417b2e0a0910f67dc349918c63 Mon Sep 17 00:00:00 2001 From: wangqx Date: Thu, 26 Jun 2025 17:09:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[fix]=E5=88=86=E8=B4=A6=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=8E=E5=88=86=E8=B4=A6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index 547e47bbd..088592384 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -17,11 +17,9 @@ import com.wzj.soopin.goods.mapper.ProductMapper; import com.wzj.soopin.goods.mapper.SkuMapper; import com.wzj.soopin.member.domain.po.Feedback; import com.wzj.soopin.member.domain.po.Member; -import com.wzj.soopin.member.domain.po.Withdraw; import com.wzj.soopin.member.mapper.*; import com.wzj.soopin.member.service.impl.FeedbackServiceImpl; import com.wzj.soopin.member.service.impl.MemberServiceImpl; -import com.wzj.soopin.member.service.impl.WithdrawServiceImpl; import com.wzj.soopin.order.convert.OrderConvert; import com.wzj.soopin.order.convert.OrderOperateHistoryConvert; import com.wzj.soopin.order.domain.bo.OrderBo; @@ -110,8 +108,8 @@ public class OrderServiceImpl extends ServiceImpl implements @Autowired private FeedbackMapper feedbackMapper; - @Autowired - private WithdrawMapper withdrawMapper; +// @Autowired +// private WithdrawMapper withdrawMapper; @Autowired private MemberServiceImpl memberService; @@ -119,8 +117,8 @@ public class OrderServiceImpl extends ServiceImpl implements @Autowired private FeedbackServiceImpl feedbackService; - @Autowired - private WithdrawServiceImpl withdrawService; +// @Autowired +// private WithdrawServiceImpl withdrawService; @Autowired private SystemStatisticsMapper systemStatisticsMapper; @@ -605,9 +603,9 @@ public Map getCount() { FeedbackWrapper.eq("status", 0); result.put("feedbackCount", feedbackService.count(FeedbackWrapper)); // 待审核提现统计 - QueryWrapper withdrawQueryWrapper = new QueryWrapper<>(); - withdrawQueryWrapper.eq("audit_status", 0); - result.put("WithdrawCount", withdrawService.count(withdrawQueryWrapper)); +// QueryWrapper withdrawQueryWrapper = new QueryWrapper<>(); +// withdrawQueryWrapper.eq("audit_status", 0); +// result.put("WithdrawCount", withdrawService.count(withdrawQueryWrapper)); // 商品统计、待审核商品统计 Map productCounts = productMapper.countProduct(); From 1d578cbf8e2eaccd598c44a9652fb56fbb4c6202 Mon Sep 17 00:00:00 2001 From: wangqx Date: Fri, 27 Jun 2025 15:43:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E5=88=86=E8=B4=A6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=AD=90=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8E=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/MemberRegisterService.java | 3 + .../controller/DivideController.java | 9 +- .../controller/DivideRuleController.java | 4 +- .../soopin/transation/domain/bo/DivideBO.java | 10 +++ .../transation/domain/bo/DivideDetailBO.java | 15 ++-- .../transation/domain/bo/DivideRuleBO.java | 4 + .../domain/bo/DivideRuleDetailBO.java | 8 +- .../soopin/transation/domain/po/Divide.java | 2 +- .../transation/domain/po/DivideRule.java | 2 + .../domain/po/DivideRuleDetail.java | 14 +-- .../soopin/transation/domain/vo/ChargeVO.java | 3 +- .../transation/domain/vo/DivideDetailVO.java | 10 +-- .../domain/vo/DivideRuleDetailVO.java | 12 +-- .../transation/domain/vo/DivideRuleVO.java | 17 +++- .../soopin/transation/domain/vo/DivideVO.java | 8 +- .../transation/domain/vo/WithdrawVO.java | 3 +- .../transation/enums/DivideRuleStatus.java | 30 +++++++ .../soopin/transation/enums/DivideStatus.java | 23 +++++ .../transation/mapper/DivideDetailMapper.java | 4 +- .../transation/mapper/DivideMapper.java | 2 + .../mapper/DivideRuleDetailMapper.java | 5 +- .../service/IDivideRuleService.java | 7 ++ .../transation/service/IDivideService.java | 5 ++ .../service/impl/DivideRuleServiceImpl.java | 85 +++++++++++++++++++ .../service/impl/DivideServiceImpl.java | 80 +++++++++++++++++ .../resources/mapper/trans/DivideMapper.xml | 28 ++++++ 26 files changed, 342 insertions(+), 51 deletions(-) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/MemberRegisterService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/MemberRegisterService.java index 7ff750f7f..0ddba7225 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/MemberRegisterService.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/MemberRegisterService.java @@ -57,6 +57,9 @@ public class MemberRegisterService { boolean exist = memberService.exists(new LambdaQueryWrapper() .eq(Member::getPhoneEncrypted, phoneNumber)); if (exist) { + + + throw new UserException("user.register.save.error", username); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java index e202de89b..744a9e8eb 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java @@ -3,9 +3,11 @@ package com.wzj.soopin.transation.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.transation.convert.DivideConvert; +import com.wzj.soopin.transation.convert.DivideDetailConvert; import com.wzj.soopin.transation.domain.bo.DivideBO; import com.wzj.soopin.transation.domain.po.Divide; import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transation.service.IDivideDetailService; import com.wzj.soopin.transation.service.IDivideService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -26,6 +28,7 @@ public class DivideController { private final IDivideService service; private final DivideConvert convert; + @Tag(name = "查询列表") @PostMapping("/list") public R> list(@RequestBody DivideBO bo, @RequestBody Page page) { @@ -37,20 +40,20 @@ public class DivideController { @Log(title = "新增 ", businessType = BusinessType.INSERT) @PostMapping("/add") public R add(@RequestBody DivideBO bo) { - return R.ok(service.save(convert.toPo(bo))); + return R.ok(service.save(bo)); } @Tag(name = "详情") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { - return R.ok(convert.toVO(service.getById(id))); + return R.ok(service.getVOById(id)); } @Tag(name = ("回调更新")) @Log(title = "回调更新", businessType = BusinessType.UPDATE) @PostMapping("/callback") public R callback(@RequestBody DivideBO bo) { - service.save(convert.toPo(bo)); + service.updateById(convert.toPo(bo)); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java index 30e10a537..6fdae92cb 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java @@ -42,13 +42,13 @@ public class DivideRuleController { @Log(title = "新增 ", businessType = BusinessType.INSERT) @PostMapping("/add") public R add(@RequestBody DivideRuleBO bo) { - return R.ok(service.save(convert.toPo(bo))); + return R.ok(service.save(bo)); } @Tag(name = "详情") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { - return R.ok(convert.toVO(service.getById(id))); + return R.ok(service.getVOById(id)); } @Tag(name = ("修改")) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java index c7343fc05..0552f503a 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java @@ -8,6 +8,8 @@ import lombok.Data; import org.dromara.common.core.domain.BaseBO; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * 订单分账 @@ -79,5 +81,13 @@ public class DivideBO extends BaseBO { @ExcelProperty(value = "订单编号", order = 9) private String orderSn; + /** + * 分账规则明细 + */ + + @Schema(description = "分账规则明细") + @ExcelProperty(value = "分账规则明细", order = 10) + private List details=new ArrayList<>(); + } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java index cc8afa143..873f28bfa 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java @@ -26,6 +26,14 @@ public class DivideDetailBO extends BaseBO { @ExcelProperty(value = "主键", order = 1) private Long id; + + /** + * 分账id + */ + @Schema(description = "分账id") + @ExcelProperty(value = "分账id", order = 2) + private Long divideId; + /** * 分账规则id */ @@ -72,12 +80,7 @@ public class DivideDetailBO extends BaseBO { * */ private Integer type; - /** - * 状态 - */ - @Schema(description = "状态") - @ExcelProperty(value = "状态", order = 5) - private Integer status; + @Schema(description = "账户id") @ExcelProperty(value = "账户id", order = 6) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java index b2e292a2b..49252070d 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java @@ -7,6 +7,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; +import java.util.ArrayList; +import java.util.List; + /** * 分账规则 * @@ -58,5 +61,6 @@ public class DivideRuleBO extends BaseBO { @ExcelProperty(value ="类型", order = 8) private Integer type; + private List details=new ArrayList<>(); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java index eb67b0b85..5da131807 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java @@ -32,7 +32,7 @@ public class DivideRuleDetailBO extends BaseBO { @Schema(description ="分账规则id") @ExcelProperty(value = "分账规则id", order = 2) - private Long divideId; + private Long ruleId; @Schema(description ="金额分配比例") @@ -43,12 +43,6 @@ public class DivideRuleDetailBO extends BaseBO { @ExcelProperty(value ="手续费分配比例", order = 5) private BigDecimal feePercent; - /** - * 状态 - */ - @Schema(description ="状态") - @ExcelProperty(value ="状态", order = 7) - private Integer status; /** * 类型 */ diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java index d06464a66..d26702e8a 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; */ @Schema(description = "订单分账") @Data -@TableName("oms_aftersale") +@TableName("trans_divide") public class Divide extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java index be5700576..3db5531b1 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java @@ -3,6 +3,7 @@ package com.wzj.soopin.transation.domain.po; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.mybatis.core.domain.BaseEntity; @@ -15,6 +16,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; */ @Schema(description="分账规则") @Data +@TableName("trans_divide_rule") public class DivideRule extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java index 2531fa209..fd1da31b1 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java @@ -3,6 +3,7 @@ package com.wzj.soopin.transation.domain.po; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.mybatis.core.domain.BaseEntity; @@ -17,6 +18,7 @@ import java.math.BigDecimal; */ @Schema(description="分账规则明细") @Data +@TableName("trans_divide_rule_detail") public class DivideRuleDetail extends BaseEntity { /** @@ -27,13 +29,11 @@ public class DivideRuleDetail extends BaseEntity { @TableId private Long id; - /** - * 提现码 - */ + @Schema(description ="分账规则id") @ExcelProperty(value = "分账规则id", order = 2) - private Long divideId; + private Long ruleId; @Schema(description ="金额分配比例") @@ -44,12 +44,6 @@ public class DivideRuleDetail extends BaseEntity { @ExcelProperty(value ="手续费分配比例", order = 5) private BigDecimal feePercent; - /** - * 状态 - */ - @Schema(description ="状态") - @ExcelProperty(value ="状态", order = 7) - private Integer status; /** * 类型 */ diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java index 0ce4197e2..e7a6504a4 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java @@ -7,6 +7,7 @@ import com.wzj.soopin.member.domain.vo.MemberVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -19,7 +20,7 @@ import java.time.LocalDateTime; */ @Schema(description="充值") @Data -public class ChargeVO extends BaseAudit { +public class ChargeVO extends BaseEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java index be35356ba..b75c36cbb 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; @@ -16,7 +17,7 @@ import java.math.BigDecimal; */ @Schema(description = "订单分账明细") @Data -public class DivideDetailVO extends BaseAudit { +public class DivideDetailVO extends BaseEntity { /** * 主键 @@ -71,12 +72,7 @@ public class DivideDetailVO extends BaseAudit { * */ private Integer type; - /** - * 状态 - */ - @Schema(description = "状态") - @ExcelProperty(value = "状态", order = 5) - private Integer status; + @Schema(description = "账户id") @ExcelProperty(value = "账户id", order = 6) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java index 34f0d7ab5..d19ffc5ec 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; @@ -16,7 +17,7 @@ import java.math.BigDecimal; */ @Schema(description="分账规则明细") @Data -public class DivideRuleDetailVO extends BaseAudit { +public class DivideRuleDetailVO extends BaseEntity { /** * 主键 @@ -31,7 +32,7 @@ public class DivideRuleDetailVO extends BaseAudit { @Schema(description ="分账规则id") @ExcelProperty(value = "分账规则id", order = 2) - private Long divideId; + private Long ruleId; @Schema(description ="金额分配比例") @@ -42,12 +43,7 @@ public class DivideRuleDetailVO extends BaseAudit { @ExcelProperty(value ="手续费分配比例", order = 5) private BigDecimal feePercent; - /** - * 状态 - */ - @Schema(description ="状态") - @ExcelProperty(value ="状态", order = 7) - private Integer status; + /** * 类型 */ diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java index 380286328..b108c5168 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java @@ -2,9 +2,14 @@ package com.wzj.soopin.transation.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.wzj.soopin.transation.domain.bo.DivideRuleDetailBO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.util.ArrayList; +import java.util.List; /** * 分账规则 @@ -14,7 +19,7 @@ import org.dromara.common.core.domain.model.BaseAudit; */ @Schema(description="分账规则") @Data -public class DivideRuleVO extends BaseAudit { +public class DivideRuleVO extends BaseEntity { /** * 主键 @@ -23,6 +28,12 @@ public class DivideRuleVO extends BaseAudit { @ExcelProperty(value = "主键", order = 1) private Long id; + + + @Schema(description ="分账规则id") + @ExcelProperty(value = "分账规则id", order = 2) + private Long ruleId; + /** * 提现码 */ @@ -57,5 +68,7 @@ public class DivideRuleVO extends BaseAudit { @ExcelProperty(value ="类型", order = 8) private Integer type; - + @Schema(description = "分账规则明细") + @ExcelProperty(value = "分账规则明细", order = 9) + private List details=new ArrayList<>(); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java index 3658137e1..01c2ede9e 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java @@ -5,8 +5,11 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * 订单分账 @@ -16,7 +19,7 @@ import java.math.BigDecimal; */ @Schema(description = "订单分账") @Data -public class DivideVO extends BaseAudit { +public class DivideVO extends BaseEntity { /** * 主键 @@ -32,6 +35,8 @@ public class DivideVO extends BaseAudit { @ExcelProperty(value = "分账规则id", order = 2) private Long ruleId; + private String ruleName; + /** @@ -78,5 +83,6 @@ public class DivideVO extends BaseAudit { @ExcelProperty(value = "订单编号", order = 9) private String orderSn; + private List details; } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java index 85f960b51..a5280f550 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java @@ -7,6 +7,7 @@ import com.wzj.soopin.member.domain.vo.MemberVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.model.BaseAudit; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -19,7 +20,7 @@ import java.time.LocalDateTime; */ @Schema(description="提现") @Data -public class WithdrawVO extends BaseAudit { +public class WithdrawVO extends BaseEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java new file mode 100644 index 000000000..67dfe9e1a --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java @@ -0,0 +1,30 @@ +package com.wzj.soopin.transation.enums; + +public enum DivideRuleStatus { + /** + * 启用 + */ + ON(1, "启用"), + /** + * 禁用 + */ + OFF(0, "禁用"); + + private final int code; + private final String message; + + DivideRuleStatus(int code, String message) { + this.code = code; + this.message = message; + } + + + public int getCode() { + return code; + } + public String getMessage() { + return message; + } + + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java new file mode 100644 index 000000000..07d263e3d --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java @@ -0,0 +1,23 @@ +package com.wzj.soopin.transation.enums; + +public enum DivideStatus { + + PENDING(0, "待分账"), + SUCCESS(1, "分账成功"), + FAIL(2, "分账失败"); + private int code; + private String desc; + + DivideStatus(int code, String desc) { + this.code = code; + this.desc = desc; + } + + public int getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java index d566fd9f9..07421c9bc 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java @@ -3,12 +3,14 @@ package com.wzj.soopin.transation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wzj.soopin.transation.domain.po.Divide; import com.wzj.soopin.transation.domain.po.DivideDetail; +import com.wzj.soopin.transation.domain.vo.DivideDetailVO; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 意见反馈Mapper接口 * * @author zcc */ -public interface DivideDetailMapper extends BaseMapper { +public interface DivideDetailMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java index 847c37c67..a138de35e 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java @@ -2,6 +2,7 @@ package com.wzj.soopin.transation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.vo.DivideVO; /** * 意见反馈Mapper接口 @@ -10,4 +11,5 @@ import com.wzj.soopin.transation.domain.po.Divide; */ public interface DivideMapper extends BaseMapper { + DivideVO getVOById( Long divideId); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java index 7866e9bbe..db1fae6c0 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java @@ -3,12 +3,15 @@ package com.wzj.soopin.transation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wzj.soopin.transation.domain.po.DivideRule; import com.wzj.soopin.transation.domain.po.DivideRuleDetail; +import com.wzj.soopin.transation.domain.vo.DivideRuleDetailVO; +import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 意见反馈Mapper接口 * * @author zcc */ -public interface DivideRuleDetailMapper extends BaseMapper { +public interface DivideRuleDetailMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java index baaf56a30..9834e837c 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java @@ -1,9 +1,16 @@ package com.wzj.soopin.transation.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.bo.DivideRuleBO; import com.wzj.soopin.transation.domain.po.Divide; import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import com.wzj.soopin.transation.domain.vo.DivideVO; public interface IDivideRuleService extends IService { + boolean save( DivideRuleBO bo); + + DivideRuleVO getVOById(Long divideId); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java index acbe7fe34..970ff7d52 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java @@ -1,8 +1,13 @@ package com.wzj.soopin.transation.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transation.domain.bo.DivideBO; import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.vo.DivideVO; public interface IDivideService extends IService { + boolean save( DivideBO bo); + + DivideVO getVOById( Long divideId); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java index b7b511253..faf2e4b96 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java @@ -1,15 +1,35 @@ package com.wzj.soopin.transation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.transation.convert.DivideConvert; +import com.wzj.soopin.transation.convert.DivideDetailConvert; +import com.wzj.soopin.transation.convert.DivideRuleConvert; +import com.wzj.soopin.transation.convert.DivideRuleDetailConvert; +import com.wzj.soopin.transation.domain.bo.DivideBO; +import com.wzj.soopin.transation.domain.bo.DivideRuleBO; import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideDetail; import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.po.DivideRuleDetail; +import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transation.enums.DivideRuleStatus; +import com.wzj.soopin.transation.enums.DivideStatus; +import com.wzj.soopin.transation.mapper.DivideDetailMapper; import com.wzj.soopin.transation.mapper.DivideMapper; +import com.wzj.soopin.transation.mapper.DivideRuleDetailMapper; import com.wzj.soopin.transation.mapper.DivideRuleMapper; import com.wzj.soopin.transation.service.IDivideRuleService; import com.wzj.soopin.transation.service.IDivideService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.List; /** * 分账服务实现类 @@ -21,4 +41,69 @@ import org.springframework.stereotype.Service; @Slf4j public class DivideRuleServiceImpl extends ServiceImpl implements IDivideRuleService { + private final DivideRuleDetailMapper detailMapper; + + private final DivideRuleDetailConvert detailConvert; + + private final DivideRuleConvert convert; + + @Transactional(rollbackFor = Exception.class) + @Override + public boolean save(DivideRuleBO bo) { + + DivideRule entity = convert.toPo(bo); + entity.setStatus(DivideRuleStatus.ON.getCode()); + // 保存主分账信息 + boolean mainResult = super.save(entity); + if (!mainResult) { + throw new ServiceException("分账主信息保存失败"); + } + + // 若明细列表不为空，批量保存分账明细信息 + if (!bo.getDetails().isEmpty()) { + List detailEntities = bo.getDetails().stream() + .peek(detailBO -> detailBO.setRuleId(entity.getId())) + .map(detailConvert::toPo) + .toList(); + + boolean detailResult = detailMapper.insertBatch(detailEntities); + if (!detailResult) { + throw new ServiceException("明细保存失败"); + } + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean removeById(Serializable id) { + // 根据主分账记录的 ID 删除对应的分账明细 + boolean detailRemoveResult = detailMapper.delete(new QueryWrapper().lambda().eq(DivideRuleDetail::getRuleId, id)) > 0; + if (!detailRemoveResult) { + log.error("分账规则明细信息删除失败，分账记录 ID: {}", id); + return false; + } + + // 删除主分账记录 + boolean mainRemoveResult = super.removeById(id); + if (!mainRemoveResult) { + log.error("分账规则主信息删除失败，分账记录 ID: {}", id); + return false; + } + return true; + + } + + @Override + public DivideRuleVO getVOById(Long divideId) { + DivideRule divideRule = baseMapper.selectById(divideId); + if (divideRule == null) { + return null; + } + List detailList = detailMapper.selectList(new QueryWrapper().lambda() + .eq(DivideRuleDetail::getRuleId, divideId)); + DivideRuleVO vo = convert.toVO(divideRule); + vo.setDetails(detailConvert.toVO(detailList)); + return vo; + } } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java index 7145ca21d..ae10aab16 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java @@ -1,12 +1,28 @@ package com.wzj.soopin.transation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.transation.convert.DivideConvert; +import com.wzj.soopin.transation.convert.DivideDetailConvert; +import com.wzj.soopin.transation.domain.bo.DivideBO; import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transation.domain.po.DivideDetail; +import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transation.enums.DivideRuleStatus; +import com.wzj.soopin.transation.enums.DivideStatus; +import com.wzj.soopin.transation.mapper.DivideDetailMapper; import com.wzj.soopin.transation.mapper.DivideMapper; import com.wzj.soopin.transation.service.IDivideService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.List; /** * 分账服务实现类 @@ -18,4 +34,68 @@ import org.springframework.stereotype.Service; @Slf4j public class DivideServiceImpl extends ServiceImpl implements IDivideService { + private final DivideDetailMapper detailMapper; + + private final DivideDetailConvert detailConvert; + + private final DivideConvert divideConvert; + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean save(DivideBO bo) { + + Divide entity = divideConvert.toPo(bo); + entity.setStatus(DivideStatus.PENDING.getCode()); + + // 保存主分账信息 + boolean mainResult = super.save(entity); + if (!mainResult) { + throw new ServiceException("分账主信息保存失败，DivideBO: {}"); + } + + // 若明细列表不为空，批量保存分账明细信息 + if (!bo.getDetails().isEmpty()) { + List detailEntities = bo.getDetails().stream() + .peek(detailBO -> detailBO.setDivideId(entity.getId())) + .map(detailConvert::toPo) + .toList(); + + boolean detailResult = detailMapper.insertBatch(detailEntities); + if (!detailResult) { + throw new ServiceException("分账主信息保存失败，DivideBO: {}"); + } + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean removeById(Serializable id) { + // 根据主分账记录的 ID 删除对应的分账明细 + boolean detailRemoveResult = detailMapper.delete(new QueryWrapper().lambda().eq(DivideDetail::getDivideId, id)) > 0; + if (!detailRemoveResult) { + log.error("分账明细信息删除失败，分账记录 ID: {}", id); + return false; + } + + // 删除主分账记录 + boolean mainRemoveResult = super.removeById(id); + if (!mainRemoveResult) { + log.error("分账主信息删除失败，分账记录 ID: {}", id); + return false; + } + return true; + + } + + @Override + public DivideVO getVOById(Long divideId) { + DivideVO divide = baseMapper.getVOById(divideId); + if (divide == null) { + return null; + } + List detailList = detailMapper.selectList(new QueryWrapper().lambda().eq(DivideDetail::getDivideId, divideId)); + divide.setDetails(detailConvert.toVO(detailList)); + return divide; + } } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml new file mode 100644 index 000000000..05a37880c --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml @@ -0,0 +1,28 @@ + + + + + + From 8f1ccba12782f82715de2fccbc7f87f6785ecb71 Mon Sep 17 00:00:00 2001 From: wangqx Date: Fri, 27 Jun 2025 15:44:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E5=88=86=E8=B4=A6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=AD=90=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8E=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wzj/soopin/transation/domain/po/DivideDetail.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java index a444e9a5f..71a9e2cb5 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java @@ -3,6 +3,7 @@ package com.wzj.soopin.transation.domain.po; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.mybatis.core.domain.BaseEntity; @@ -17,6 +18,7 @@ import java.math.BigDecimal; */ @Schema(description = "订单分账明细") @Data +@TableName("trans_divide_detail") public class DivideDetail extends BaseEntity { /** @@ -27,12 +29,13 @@ public class DivideDetail extends BaseEntity { @TableId private Long id; + /** * 分账规则id */ - @Schema(description = "分账规则id") - @ExcelProperty(value = "分账规则id", order = 2) - private Long ruleId; + @Schema(description = "分账id") + @ExcelProperty(value = "分账id", order = 2) + private Long divideId; /** * 分账规则明细id @@ -76,7 +79,7 @@ public class DivideDetail extends BaseEntity { /** * 状态 */ - @Schema(description = "状态") + @Schema(description = "状态 0 未分账 1 分账成功 2 分账失败") @ExcelProperty(value = "状态", order = 5) private Integer status; From a46369f8c87af148cd9ea0d6050db2677c7ca459 Mon Sep 17 00:00:00 2001 From: wangqx Date: Mon, 30 Jun 2025 10:00:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E5=88=86=E8=B4=A6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=AD=90=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8E=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/web/service/SysLoginService.java | 3 ++ .../src/main/resources/application.yml | 4 +-- .../controller/ChargeController.java | 12 +++---- .../controller/DivideController.java | 14 ++++---- .../controller/DivideRuleController.java | 17 ++++------ .../controller/WithdrawController.java | 12 +++---- .../convert/ChargeConvert.java | 8 ++--- .../convert/DivideConvert.java | 8 ++--- .../convert/DivideDetailConvert.java | 12 +++++++ .../convert/DivideRuleConvert.java | 8 ++--- .../convert/DivideRuleDetailConvert.java | 12 +++++++ .../convert/WithdrawConvert.java | 8 ++--- .../domain/bo/ChargeBO.java | 4 +-- .../domain/bo/DivideBO.java | 4 +-- .../domain/bo/DivideDetailBO.java | 4 +-- .../domain/bo/DivideRuleBO.java | 4 +-- .../domain/bo/DivideRuleDetailBO.java | 4 +-- .../domain/bo/WithdrawBO.java | 4 +-- .../domain/po/Charge.java | 2 +- .../domain/po/Divide.java | 2 +- .../domain/po/DivideDetail.java | 2 +- .../domain/po/DivideRule.java | 2 +- .../domain/po/DivideRuleDetail.java | 2 +- .../domain/po/Withdraw.java | 2 +- .../domain/vo/ChargeVO.java | 2 +- .../domain/vo/DivideDetailVO.java | 2 +- .../domain/vo/DivideRuleDetailVO.java | 2 +- .../domain/vo/DivideRuleVO.java | 4 +-- .../domain/vo/DivideVO.java | 4 +-- .../domain/vo/WithdrawVO.java | 2 +- .../domain/vo/YishengAccountVO.java | 2 +- .../enums/DivideRuleStatus.java | 2 +- .../enums/DivideStatus.java | 2 +- .../enums/WithdrawAuditStatus.java | 2 +- .../enums/WithdrawStatus.java | 2 +- .../mapper/ChargeMapper.java | 4 +-- .../mapper/DivideDetailMapper.java | 14 ++++++++ .../mapper/DivideMapper.java | 6 ++-- .../mapper/DivideRuleDetailMapper.java | 14 ++++++++ .../mapper/DivideRuleMapper.java | 5 ++- .../mapper/WithdrawMapper.java | 4 +-- .../service/IChargeService.java | 4 +-- .../service/IDivideDetailService.java | 8 +++++ .../service/IDivideRuleDetailService.java | 8 +++++ .../service/IDivideRuleService.java | 13 ++++++++ .../transaction/service/IDivideService.java | 13 ++++++++ .../service/IWithdrawService.java | 6 ++-- .../service/IYishengService.java | 4 +-- .../service/impl/ChargeServiceImpl.java | 8 ++--- .../service/impl/DivideDetailServiceImpl.java | 11 +++---- .../impl/DivideRuleDetailServiceImpl.java | 11 +++---- .../service/impl/DivideRuleServiceImpl.java | 32 +++++++------------ .../service/impl/DivideServiceImpl.java | 25 +++++++-------- .../service/impl/WithdrawServiceImpl.java | 18 +++++------ .../service/impl/YishengServiceImpl.java | 6 ++-- .../convert/DivideDetailConvert.java | 18 ----------- .../convert/DivideRuleDetailConvert.java | 15 --------- .../transation/mapper/DivideDetailMapper.java | 16 ---------- .../mapper/DivideRuleDetailMapper.java | 17 ---------- .../service/IDivideDetailService.java | 9 ------ .../service/IDivideRuleDetailService.java | 9 ------ .../service/IDivideRuleService.java | 16 ---------- .../transation/service/IDivideService.java | 13 -------- .../{trans => transaction}/DivideMapper.xml | 4 +-- 64 files changed, 232 insertions(+), 279 deletions(-) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/controller/ChargeController.java (86%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/controller/DivideController.java (79%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/controller/DivideRuleController.java (76%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/controller/WithdrawController.java (84%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/convert/ChargeConvert.java (56%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/convert/DivideConvert.java (52%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideDetailConvert.java rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/convert/DivideRuleConvert.java (53%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleDetailConvert.java rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/convert/WithdrawConvert.java (56%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/bo/ChargeBO.java (95%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/bo/DivideBO.java (95%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/bo/DivideDetailBO.java (95%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/bo/DivideRuleBO.java (93%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/bo/DivideRuleDetailBO.java (91%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/bo/WithdrawBO.java (95%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/po/Charge.java (96%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/po/Divide.java (97%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/po/DivideDetail.java (98%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/po/DivideRule.java (96%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/po/DivideRuleDetail.java (96%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/po/Withdraw.java (96%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/ChargeVO.java (98%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/DivideDetailVO.java (98%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/DivideRuleDetailVO.java (96%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/DivideRuleVO.java (91%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/DivideVO.java (93%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/WithdrawVO.java (98%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/domain/vo/YishengAccountVO.java (89%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/enums/DivideRuleStatus.java (91%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/enums/DivideStatus.java (90%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/enums/WithdrawAuditStatus.java (91%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/enums/WithdrawStatus.java (91%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/mapper/ChargeMapper.java (64%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideDetailMapper.java rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/mapper/DivideMapper.java (59%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleDetailMapper.java rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/mapper/DivideRuleMapper.java (55%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/mapper/WithdrawMapper.java (56%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/IChargeService.java (63%) create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideDetailService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleDetailService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleService.java create mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/IWithdrawService.java (55%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/IYishengService.java (88%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/ChargeServiceImpl.java (75%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/DivideDetailServiceImpl.java (51%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/DivideRuleDetailServiceImpl.java (51%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/DivideRuleServiceImpl.java (71%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/DivideServiceImpl.java (79%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/WithdrawServiceImpl.java (89%) rename ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/{transation => transaction}/service/impl/YishengServiceImpl.java (85%) delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java delete mode 100644 ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java rename ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/{trans => transaction}/DivideMapper.xml (80%) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java index 07d13655e..ce31f495e 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java @@ -52,6 +52,7 @@ import java.util.function.Supplier; @Service public class SysLoginService { + @Value("${user.password.maxRetryCount}") private Integer maxRetryCount; @@ -74,6 +75,8 @@ public class SysLoginService { */ @Lock4j public void socialRegister(AuthUser authUserData) { + + String authId = authUserData.getSource() + authUserData.getUuid(); // 第三方用户信息 SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a39a68e61..7af35dcf1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -258,8 +258,8 @@ springdoc: packages-to-scan: com.wzj.soopin.goods - group: 4.内容模块 packages-to-scan: com.wzj.soopin.content - - group: 5.结算模块 - packages-to-scan: com.wzj.soopin.pay + - group: 5.交易模块 + packages-to-scan: com.wzj.soopin.transaction - group: 6.IM模块 packages-to-scan: com.wzj.soopin.im - group: 7.系统模块 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/ChargeController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/ChargeController.java similarity index 86% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/ChargeController.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/ChargeController.java index bc731fdd5..abc67c4ff 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/ChargeController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/ChargeController.java @@ -1,13 +1,13 @@ -package com.wzj.soopin.transation.controller; +package com.wzj.soopin.transaction.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.member.annotation.MemberFillMethod; -import com.wzj.soopin.transation.convert.ChargeConvert; -import com.wzj.soopin.transation.domain.bo.ChargeBO; -import com.wzj.soopin.transation.domain.po.Charge; -import com.wzj.soopin.transation.domain.vo.ChargeVO; -import com.wzj.soopin.transation.service.IChargeService; +import com.wzj.soopin.transaction.convert.ChargeConvert; +import com.wzj.soopin.transaction.domain.bo.ChargeBO; +import com.wzj.soopin.transaction.domain.po.Charge; +import com.wzj.soopin.transaction.domain.vo.ChargeVO; +import com.wzj.soopin.transaction.service.IChargeService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java similarity index 79% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java index 744a9e8eb..c4dca8dcf 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java @@ -1,14 +1,12 @@ -package com.wzj.soopin.transation.controller; +package com.wzj.soopin.transaction.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.transation.convert.DivideConvert; -import com.wzj.soopin.transation.convert.DivideDetailConvert; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.vo.DivideVO; -import com.wzj.soopin.transation.service.IDivideDetailService; -import com.wzj.soopin.transation.service.IDivideService; +import com.wzj.soopin.transaction.convert.DivideConvert; +import com.wzj.soopin.transaction.domain.bo.DivideBO; +import com.wzj.soopin.transaction.domain.po.Divide; +import com.wzj.soopin.transaction.domain.vo.DivideVO; +import com.wzj.soopin.transaction.service.IDivideService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideRuleController.java similarity index 76% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideRuleController.java index 6fdae92cb..c9b1d0aa5 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/DivideRuleController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideRuleController.java @@ -1,17 +1,12 @@ -package com.wzj.soopin.transation.controller; +package com.wzj.soopin.transaction.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.transation.convert.DivideConvert; -import com.wzj.soopin.transation.convert.DivideRuleConvert; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.bo.DivideRuleBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.vo.DivideRuleVO; -import com.wzj.soopin.transation.domain.vo.DivideVO; -import com.wzj.soopin.transation.service.IDivideRuleService; -import com.wzj.soopin.transation.service.IDivideService; +import com.wzj.soopin.transaction.convert.DivideRuleConvert; +import com.wzj.soopin.transaction.domain.bo.DivideRuleBO; +import com.wzj.soopin.transaction.domain.po.DivideRule; +import com.wzj.soopin.transaction.domain.vo.DivideRuleVO; +import com.wzj.soopin.transaction.service.IDivideRuleService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/WithdrawController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/WithdrawController.java similarity index 84% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/WithdrawController.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/WithdrawController.java index f814504c2..2be39f67b 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/controller/WithdrawController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/WithdrawController.java @@ -1,13 +1,13 @@ -package com.wzj.soopin.transation.controller; +package com.wzj.soopin.transaction.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.member.annotation.MemberFillMethod; -import com.wzj.soopin.transation.convert.WithdrawConvert; -import com.wzj.soopin.transation.domain.bo.WithdrawBO; -import com.wzj.soopin.transation.domain.po.Withdraw; -import com.wzj.soopin.transation.domain.vo.WithdrawVO; -import com.wzj.soopin.transation.service.IWithdrawService; +import com.wzj.soopin.transaction.convert.WithdrawConvert; +import com.wzj.soopin.transaction.domain.bo.WithdrawBO; +import com.wzj.soopin.transaction.domain.po.Withdraw; +import com.wzj.soopin.transaction.domain.vo.WithdrawVO; +import com.wzj.soopin.transaction.service.IWithdrawService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/ChargeConvert.java similarity index 56% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/ChargeConvert.java index 8bc43607d..3cf16f1cc 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/ChargeConvert.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/ChargeConvert.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.convert; +package com.wzj.soopin.transaction.convert; -import com.wzj.soopin.transation.domain.bo.ChargeBO; -import com.wzj.soopin.transation.domain.po.Charge; -import com.wzj.soopin.transation.domain.vo.ChargeVO; +import com.wzj.soopin.transaction.domain.bo.ChargeBO; +import com.wzj.soopin.transaction.domain.po.Charge; +import com.wzj.soopin.transaction.domain.vo.ChargeVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideConvert.java similarity index 52% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideConvert.java index e8e665019..9bbfd3732 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideConvert.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideConvert.java @@ -1,9 +1,9 @@ -package com.wzj.soopin.transation.convert; +package com.wzj.soopin.transaction.convert; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transaction.domain.bo.DivideBO; +import com.wzj.soopin.transaction.domain.po.Divide; +import com.wzj.soopin.transaction.domain.vo.DivideVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideDetailConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideDetailConvert.java new file mode 100644 index 000000000..b192cc5a8 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideDetailConvert.java @@ -0,0 +1,12 @@ +package com.wzj.soopin.transaction.convert; + + +import com.wzj.soopin.transaction.domain.bo.DivideDetailBO; +import com.wzj.soopin.transaction.domain.po.DivideDetail; +import com.wzj.soopin.transaction.domain.vo.DivideDetailVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface DivideDetailConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleConvert.java similarity index 53% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleConvert.java index 499baf7e5..f965b9ddc 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleConvert.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleConvert.java @@ -1,9 +1,9 @@ -package com.wzj.soopin.transation.convert; +package com.wzj.soopin.transaction.convert; -import com.wzj.soopin.transation.domain.bo.DivideRuleBO; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.vo.DivideRuleVO; +import com.wzj.soopin.transaction.domain.bo.DivideRuleBO; +import com.wzj.soopin.transaction.domain.po.DivideRule; +import com.wzj.soopin.transaction.domain.vo.DivideRuleVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleDetailConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleDetailConvert.java new file mode 100644 index 000000000..16e02a1b8 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/DivideRuleDetailConvert.java @@ -0,0 +1,12 @@ +package com.wzj.soopin.transaction.convert; + + +import com.wzj.soopin.transaction.domain.bo.DivideRuleDetailBO; +import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; +import com.wzj.soopin.transaction.domain.vo.DivideRuleDetailVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface DivideRuleDetailConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/WithdrawConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/WithdrawConvert.java similarity index 56% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/WithdrawConvert.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/WithdrawConvert.java index 49dcc88b6..ba00b25fc 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/WithdrawConvert.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/convert/WithdrawConvert.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.convert; +package com.wzj.soopin.transaction.convert; -import com.wzj.soopin.transation.domain.bo.WithdrawBO; -import com.wzj.soopin.transation.domain.po.Withdraw; -import com.wzj.soopin.transation.domain.vo.WithdrawVO; +import com.wzj.soopin.transaction.domain.bo.WithdrawBO; +import com.wzj.soopin.transaction.domain.po.Withdraw; +import com.wzj.soopin.transaction.domain.vo.WithdrawVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/ChargeBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/ChargeBO.java similarity index 95% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/ChargeBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/ChargeBO.java index e02c272b7..ea93b198d 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/ChargeBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/ChargeBO.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.domain.bo; +package com.wzj.soopin.transaction.domain.bo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wzj.soopin.transation.domain.po.Charge; +import com.wzj.soopin.transaction.domain.po.Charge; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideBO.java similarity index 95% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideBO.java index 0552f503a..a66a0cb05 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideBO.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.domain.bo; +package com.wzj.soopin.transaction.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; -import com.wzj.soopin.transation.domain.po.Divide; +import com.wzj.soopin.transaction.domain.po.Divide; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideDetailBO.java similarity index 95% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideDetailBO.java index 873f28bfa..bb959267c 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideDetailBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideDetailBO.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.domain.bo; +package com.wzj.soopin.transaction.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; -import com.wzj.soopin.transation.domain.po.DivideDetail; +import com.wzj.soopin.transaction.domain.po.DivideDetail; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideRuleBO.java similarity index 93% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideRuleBO.java index 49252070d..b35ce9756 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideRuleBO.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.domain.bo; +package com.wzj.soopin.transaction.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; -import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transaction.domain.po.DivideRule; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideRuleDetailBO.java similarity index 91% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideRuleDetailBO.java index 5da131807..dc712d7cf 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/DivideRuleDetailBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/DivideRuleDetailBO.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.domain.bo; +package com.wzj.soopin.transaction.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; -import com.wzj.soopin.transation.domain.po.DivideRuleDetail; +import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/WithdrawBO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/WithdrawBO.java similarity index 95% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/WithdrawBO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/WithdrawBO.java index 344ee4551..db64bc9c3 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/bo/WithdrawBO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/bo/WithdrawBO.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.domain.bo; +package com.wzj.soopin.transaction.domain.bo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wzj.soopin.transation.domain.po.Withdraw; +import com.wzj.soopin.transaction.domain.po.Withdraw; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.dromara.common.core.domain.BaseBO; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Charge.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Charge.java similarity index 96% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Charge.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Charge.java index c6a13138b..908fb08e0 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Charge.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Charge.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.domain.po; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java similarity index 97% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java index d26702e8a..7655c84de 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Divide.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java similarity index 98% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java index 71a9e2cb5..cbb69fce6 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideDetail.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java similarity index 96% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java index 3db5531b1..2ac2ba9cc 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRule.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java similarity index 96% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java index fd1da31b1..182c2711b 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/DivideRuleDetail.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Withdraw.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Withdraw.java similarity index 96% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Withdraw.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Withdraw.java index 48850dec7..003a50d17 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/po/Withdraw.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Withdraw.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.domain.po; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/ChargeVO.java similarity index 98% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/ChargeVO.java index e7a6504a4..131f00e28 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/ChargeVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/ChargeVO.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideDetailVO.java similarity index 98% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideDetailVO.java index b75c36cbb..64b26cfd7 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideDetailVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideDetailVO.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideRuleDetailVO.java similarity index 96% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideRuleDetailVO.java index d19ffc5ec..26ca81b8b 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleDetailVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideRuleDetailVO.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideRuleVO.java similarity index 91% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideRuleVO.java index b108c5168..651365247 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideRuleVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideRuleVO.java @@ -1,11 +1,9 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.wzj.soopin.transation.domain.bo.DivideRuleDetailBO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideVO.java similarity index 93% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideVO.java index 01c2ede9e..ea353829c 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/DivideVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/DivideVO.java @@ -1,14 +1,12 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; /** diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/WithdrawVO.java similarity index 98% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/WithdrawVO.java index a5280f550..4332e1493 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/WithdrawVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/WithdrawVO.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/YishengAccountVO.java similarity index 89% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/YishengAccountVO.java index 52599ef7f..93a687f23 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/domain/vo/YishengAccountVO.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/vo/YishengAccountVO.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.domain.vo; +package com.wzj.soopin.transaction.domain.vo; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideRuleStatus.java similarity index 91% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideRuleStatus.java index 67dfe9e1a..ff3da1400 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideRuleStatus.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideRuleStatus.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.enums; +package com.wzj.soopin.transaction.enums; public enum DivideRuleStatus { /** diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideStatus.java similarity index 90% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideStatus.java index 07d263e3d..5a3b62439 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/DivideStatus.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideStatus.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.enums; +package com.wzj.soopin.transaction.enums; public enum DivideStatus { diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawAuditStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/WithdrawAuditStatus.java similarity index 91% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawAuditStatus.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/WithdrawAuditStatus.java index 0b0f838fb..e6b365076 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawAuditStatus.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/WithdrawAuditStatus.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.enums; +package com.wzj.soopin.transaction.enums; public enum WithdrawAuditStatus { PENDING(0, "待审核"), diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/WithdrawStatus.java similarity index 91% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawStatus.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/WithdrawStatus.java index ef50e35c1..71d275005 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/enums/WithdrawStatus.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/WithdrawStatus.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.transation.enums; +package com.wzj.soopin.transaction.enums; public enum WithdrawStatus { WAITING(0, "等待转账"), diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/ChargeMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/ChargeMapper.java similarity index 64% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/ChargeMapper.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/ChargeMapper.java index a190fddc2..604752a6b 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/ChargeMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/ChargeMapper.java @@ -1,7 +1,7 @@ -package com.wzj.soopin.transation.mapper; +package com.wzj.soopin.transaction.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.transation.domain.po.Charge; +import com.wzj.soopin.transaction.domain.po.Charge; /** * 意见反馈Mapper接口 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideDetailMapper.java new file mode 100644 index 000000000..a9088cf7f --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideDetailMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.transaction.mapper; + +import com.wzj.soopin.transaction.domain.po.DivideDetail; +import com.wzj.soopin.transaction.domain.vo.DivideDetailVO; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideMapper.java similarity index 59% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideMapper.java index a138de35e..d5118eda3 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideMapper.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.mapper; +package com.wzj.soopin.transaction.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.vo.DivideVO; +import com.wzj.soopin.transaction.domain.po.Divide; +import com.wzj.soopin.transaction.domain.vo.DivideVO; /** * 意见反馈Mapper接口 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleDetailMapper.java new file mode 100644 index 000000000..56fd58f2a --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleDetailMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.transaction.mapper; + +import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; +import com.wzj.soopin.transaction.domain.vo.DivideRuleDetailVO; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideRuleDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleMapper.java similarity index 55% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleMapper.java index ef292868f..d166062e7 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideRuleMapper.java @@ -1,8 +1,7 @@ -package com.wzj.soopin.transation.mapper; +package com.wzj.soopin.transaction.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideRule; +import com.wzj.soopin.transaction.domain.po.DivideRule; /** * 意见反馈Mapper接口 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/WithdrawMapper.java similarity index 56% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/WithdrawMapper.java index 87ef08f2d..6f81c8eac 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/WithdrawMapper.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/WithdrawMapper.java @@ -1,7 +1,7 @@ -package com.wzj.soopin.transation.mapper; +package com.wzj.soopin.transaction.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.transation.domain.po.Withdraw; +import com.wzj.soopin.transaction.domain.po.Withdraw; public interface WithdrawMapper extends BaseMapper { diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IChargeService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IChargeService.java similarity index 63% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IChargeService.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IChargeService.java index ce3f96462..f0f4002eb 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IChargeService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IChargeService.java @@ -1,7 +1,7 @@ -package com.wzj.soopin.transation.service; +package com.wzj.soopin.transaction.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.transation.domain.po.Charge; +import com.wzj.soopin.transaction.domain.po.Charge; public interface IChargeService extends IService { diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideDetailService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideDetailService.java new file mode 100644 index 000000000..17b7d8ed9 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideDetailService.java @@ -0,0 +1,8 @@ +package com.wzj.soopin.transaction.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transaction.domain.po.DivideDetail; + +public interface IDivideDetailService extends IService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleDetailService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleDetailService.java new file mode 100644 index 000000000..90578f623 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleDetailService.java @@ -0,0 +1,8 @@ +package com.wzj.soopin.transaction.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; + +public interface IDivideRuleDetailService extends IService { + +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleService.java new file mode 100644 index 000000000..5f3b03d80 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideRuleService.java @@ -0,0 +1,13 @@ +package com.wzj.soopin.transaction.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transaction.domain.bo.DivideRuleBO; +import com.wzj.soopin.transaction.domain.po.DivideRule; +import com.wzj.soopin.transaction.domain.vo.DivideRuleVO; + +public interface IDivideRuleService extends IService { + + boolean save( DivideRuleBO bo); + + DivideRuleVO getVOById(Long divideId); +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java new file mode 100644 index 000000000..203aa570a --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java @@ -0,0 +1,13 @@ +package com.wzj.soopin.transaction.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.transaction.domain.bo.DivideBO; +import com.wzj.soopin.transaction.domain.po.Divide; +import com.wzj.soopin.transaction.domain.vo.DivideVO; + +public interface IDivideService extends IService { + + boolean save( DivideBO bo); + + DivideVO getVOById( Long divideId); +} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IWithdrawService.java similarity index 55% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IWithdrawService.java index ca007d2c6..e7c7ece34 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IWithdrawService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IWithdrawService.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.service; +package com.wzj.soopin.transaction.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.transation.domain.bo.WithdrawBO; -import com.wzj.soopin.transation.domain.po.Withdraw; +import com.wzj.soopin.transaction.domain.bo.WithdrawBO; +import com.wzj.soopin.transaction.domain.po.Withdraw; public interface IWithdrawService extends IService { boolean audit(WithdrawBO bo); diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IYishengService.java similarity index 88% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IYishengService.java index e34971b72..915d88197 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IYishengService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IYishengService.java @@ -1,7 +1,7 @@ -package com.wzj.soopin.transation.service; +package com.wzj.soopin.transaction.service; -import com.wzj.soopin.transation.domain.vo.YishengAccountVO; +import com.wzj.soopin.transaction.domain.vo.YishengAccountVO; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/ChargeServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java similarity index 75% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/ChargeServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java index 8b7cceda3..e8741da46 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/ChargeServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java @@ -1,9 +1,9 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.transation.domain.po.Charge; -import com.wzj.soopin.transation.mapper.ChargeMapper; -import com.wzj.soopin.transation.service.IChargeService; +import com.wzj.soopin.transaction.domain.po.Charge; +import com.wzj.soopin.transaction.mapper.ChargeMapper; +import com.wzj.soopin.transaction.service.IChargeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideDetailServiceImpl.java similarity index 51% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideDetailServiceImpl.java index 4b725b747..76628fee1 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideDetailServiceImpl.java @@ -1,12 +1,9 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideDetail; -import com.wzj.soopin.transation.mapper.DivideDetailMapper; -import com.wzj.soopin.transation.mapper.DivideMapper; -import com.wzj.soopin.transation.service.IDivideDetailService; -import com.wzj.soopin.transation.service.IDivideService; +import com.wzj.soopin.transaction.domain.po.DivideDetail; +import com.wzj.soopin.transaction.mapper.DivideDetailMapper; +import com.wzj.soopin.transaction.service.IDivideDetailService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleDetailServiceImpl.java similarity index 51% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleDetailServiceImpl.java index ea10cba6b..242b0c96e 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleDetailServiceImpl.java @@ -1,12 +1,9 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideRuleDetail; -import com.wzj.soopin.transation.mapper.DivideMapper; -import com.wzj.soopin.transation.mapper.DivideRuleDetailMapper; -import com.wzj.soopin.transation.service.IDivideRuleDetailService; -import com.wzj.soopin.transation.service.IDivideService; +import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; +import com.wzj.soopin.transaction.mapper.DivideRuleDetailMapper; +import com.wzj.soopin.transaction.service.IDivideRuleDetailService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleServiceImpl.java similarity index 71% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleServiceImpl.java index faf2e4b96..4962d8cfc 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleServiceImpl.java @@ -1,27 +1,17 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.transation.convert.DivideConvert; -import com.wzj.soopin.transation.convert.DivideDetailConvert; -import com.wzj.soopin.transation.convert.DivideRuleConvert; -import com.wzj.soopin.transation.convert.DivideRuleDetailConvert; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.bo.DivideRuleBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideDetail; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.po.DivideRuleDetail; -import com.wzj.soopin.transation.domain.vo.DivideRuleVO; -import com.wzj.soopin.transation.domain.vo.DivideVO; -import com.wzj.soopin.transation.enums.DivideRuleStatus; -import com.wzj.soopin.transation.enums.DivideStatus; -import com.wzj.soopin.transation.mapper.DivideDetailMapper; -import com.wzj.soopin.transation.mapper.DivideMapper; -import com.wzj.soopin.transation.mapper.DivideRuleDetailMapper; -import com.wzj.soopin.transation.mapper.DivideRuleMapper; -import com.wzj.soopin.transation.service.IDivideRuleService; -import com.wzj.soopin.transation.service.IDivideService; +import com.wzj.soopin.transaction.convert.DivideRuleConvert; +import com.wzj.soopin.transaction.convert.DivideRuleDetailConvert; +import com.wzj.soopin.transaction.domain.bo.DivideRuleBO; +import com.wzj.soopin.transaction.domain.po.DivideRule; +import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; +import com.wzj.soopin.transaction.domain.vo.DivideRuleVO; +import com.wzj.soopin.transaction.enums.DivideRuleStatus; +import com.wzj.soopin.transaction.mapper.DivideRuleDetailMapper; +import com.wzj.soopin.transaction.mapper.DivideRuleMapper; +import com.wzj.soopin.transaction.service.IDivideRuleService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.exception.ServiceException; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java similarity index 79% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java index ae10aab16..cc62aaf10 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java @@ -1,20 +1,17 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.transation.convert.DivideConvert; -import com.wzj.soopin.transation.convert.DivideDetailConvert; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideDetail; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.vo.DivideVO; -import com.wzj.soopin.transation.enums.DivideRuleStatus; -import com.wzj.soopin.transation.enums.DivideStatus; -import com.wzj.soopin.transation.mapper.DivideDetailMapper; -import com.wzj.soopin.transation.mapper.DivideMapper; -import com.wzj.soopin.transation.service.IDivideService; +import com.wzj.soopin.transaction.convert.DivideConvert; +import com.wzj.soopin.transaction.convert.DivideDetailConvert; +import com.wzj.soopin.transaction.domain.bo.DivideBO; +import com.wzj.soopin.transaction.domain.po.Divide; +import com.wzj.soopin.transaction.domain.po.DivideDetail; +import com.wzj.soopin.transaction.domain.vo.DivideVO; +import com.wzj.soopin.transaction.enums.DivideStatus; +import com.wzj.soopin.transaction.mapper.DivideDetailMapper; +import com.wzj.soopin.transaction.mapper.DivideMapper; +import com.wzj.soopin.transaction.service.IDivideService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.exception.ServiceException; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/WithdrawServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/WithdrawServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/WithdrawServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/WithdrawServiceImpl.java index 21f54b4dd..dca8a8bf6 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/WithdrawServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/WithdrawServiceImpl.java @@ -1,19 +1,19 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.transation.domain.bo.WithdrawBO; +import com.wzj.soopin.transaction.domain.bo.WithdrawBO; import com.wzj.soopin.member.domain.po.MemberAccount; import com.wzj.soopin.member.domain.po.MemberAccountChangeRecord; -import com.wzj.soopin.transation.domain.po.Withdraw; +import com.wzj.soopin.transaction.domain.po.Withdraw; import com.wzj.soopin.member.enums.MemberAccountChangeRecordChangeTypeEnum; import com.wzj.soopin.member.enums.MemberAccountChangeRecordSourceEnum; -import com.wzj.soopin.transation.enums.WithdrawAuditStatus; -import com.wzj.soopin.transation.enums.WithdrawStatus; -import com.wzj.soopin.transation.mapper.WithdrawMapper; +import com.wzj.soopin.transaction.enums.WithdrawAuditStatus; +import com.wzj.soopin.transaction.enums.WithdrawStatus; +import com.wzj.soopin.transaction.mapper.WithdrawMapper; import com.wzj.soopin.member.service.*; -import com.wzj.soopin.transation.domain.vo.YishengAccountVO; -import com.wzj.soopin.transation.service.IWithdrawService; -import com.wzj.soopin.transation.service.IYishengService; +import com.wzj.soopin.transaction.domain.vo.YishengAccountVO; +import com.wzj.soopin.transaction.service.IWithdrawService; +import com.wzj.soopin.transaction.service.IYishengService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.satoken.utils.LoginHelper; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/YishengServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/YishengServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/YishengServiceImpl.java rename to ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/YishengServiceImpl.java index 74908a2eb..a4a7af28a 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/YishengServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/YishengServiceImpl.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.transation.service.impl; +package com.wzj.soopin.transaction.service.impl; -import com.wzj.soopin.transation.domain.vo.YishengAccountVO; -import com.wzj.soopin.transation.service.IYishengService; +import com.wzj.soopin.transaction.domain.vo.YishengAccountVO; +import com.wzj.soopin.transaction.service.IYishengService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java deleted file mode 100644 index ed2d5f53c..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideDetailConvert.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.wzj.soopin.transation.convert; - - -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.bo.DivideDetailBO; -import com.wzj.soopin.transation.domain.bo.DivideRuleBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideDetail; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.vo.DivideDetailVO; -import com.wzj.soopin.transation.domain.vo.DivideRuleVO; -import com.wzj.soopin.transation.domain.vo.DivideVO; -import org.dromara.common.web.core.BaseConverter; -import org.mapstruct.Mapper; - -@Mapper(componentModel = "spring",uses = BaseConverter.class) -public interface DivideDetailConvert extends BaseConverter { -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java deleted file mode 100644 index 034fff100..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/convert/DivideRuleDetailConvert.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wzj.soopin.transation.convert; - - -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.bo.DivideRuleDetailBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideRuleDetail; -import com.wzj.soopin.transation.domain.vo.DivideRuleDetailVO; -import com.wzj.soopin.transation.domain.vo.DivideVO; -import org.dromara.common.web.core.BaseConverter; -import org.mapstruct.Mapper; - -@Mapper(componentModel = "spring",uses = BaseConverter.class) -public interface DivideRuleDetailConvert extends BaseConverter { -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java deleted file mode 100644 index 07421c9bc..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wzj.soopin.transation.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideDetail; -import com.wzj.soopin.transation.domain.vo.DivideDetailVO; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 意见反馈Mapper接口 - * - * @author zcc - */ -public interface DivideDetailMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java deleted file mode 100644 index db1fae6c0..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.wzj.soopin.transation.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.po.DivideRuleDetail; -import com.wzj.soopin.transation.domain.vo.DivideRuleDetailVO; -import com.wzj.soopin.transation.domain.vo.DivideRuleVO; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 意见反馈Mapper接口 - * - * @author zcc - */ -public interface DivideRuleDetailMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java deleted file mode 100644 index 49d53012d..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideDetailService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.wzj.soopin.transation.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideDetail; - -public interface IDivideDetailService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java deleted file mode 100644 index e39123baf..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleDetailService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.wzj.soopin.transation.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.po.DivideRuleDetail; - -public interface IDivideRuleDetailService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java deleted file mode 100644 index 9834e837c..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wzj.soopin.transation.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.bo.DivideRuleBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.po.DivideRule; -import com.wzj.soopin.transation.domain.vo.DivideRuleVO; -import com.wzj.soopin.transation.domain.vo.DivideVO; - -public interface IDivideRuleService extends IService { - - boolean save( DivideRuleBO bo); - - DivideRuleVO getVOById(Long divideId); -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java deleted file mode 100644 index 970ff7d52..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wzj.soopin.transation.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wzj.soopin.transation.domain.bo.DivideBO; -import com.wzj.soopin.transation.domain.po.Divide; -import com.wzj.soopin.transation.domain.vo.DivideVO; - -public interface IDivideService extends IService { - - boolean save( DivideBO bo); - - DivideVO getVOById( Long divideId); -} diff --git a/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml similarity index 80% rename from ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml rename to ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml index 05a37880c..c5d30acd8 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/trans/DivideMapper.xml +++ b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml @@ -2,9 +2,9 @@ - + - SELECT d.id, d.order_sn, From 06e1f6d7edfe25dc4dbc7735ef5281553aa28e85 Mon Sep 17 00:00:00 2001 From: wangqx Date: Mon, 30 Jun 2025 10:05:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=90=8E=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/web/service/impl/IndexServiceImpl.java | 4 ++-- .../com/wzj/soopin/order/service/impl/OrderServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java index 1971997c3..0c0bbfed6 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.wzj.soopin.content.mapper.VlogMapper; import com.wzj.soopin.goods.mapper.ProductMapper; import com.wzj.soopin.member.domain.po.Feedback; -import com.wzj.soopin.member.domain.po.Withdraw; import com.wzj.soopin.member.service.impl.FeedbackServiceImpl; import com.wzj.soopin.member.service.impl.MemberServiceImpl; -import com.wzj.soopin.member.service.impl.WithdrawServiceImpl; import com.wzj.soopin.order.mapper.OrderMapper; +import com.wzj.soopin.transaction.domain.po.Withdraw; +import com.wzj.soopin.transaction.service.impl.WithdrawServiceImpl; import org.dromara.system.mapper.SysIntegralHistoryMapper; import org.dromara.system.mapper.SysTenantMapper; import org.dromara.system.mapper.SystemStatisticsMapper; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index 974e7da1c..860ae05a5 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -66,7 +66,8 @@ public class OrderServiceImpl extends ServiceImpl implements private final VerificationCodeService verificationCodeService; private final SysTenantMapper sysTenantMapper; - public OrderServiceImpl(OrderMapper orderMapper, OrderItemMapper orderItemMapper, SkuMapper skuMapper, OrderOperateHistoryMapper orderOperateHistoryMapper, MemberMapper memberMapper, OrderDeliveryHistoryMapper orderDeliveryHistoryMapper, VerificationCodeService verificationCodeService, SysTenantMapper sysTenantMapper) { + public OrderServiceImpl(OrderMapper orderMapper, OrderItemMapper orderItemMapper, SkuMapper skuMapper, + OrderOperateHistoryMapper orderOperateHistoryMapper, MemberMapper memberMapper, OrderDeliveryHistoryMapper orderDeliveryHistoryMapper, VerificationCodeService verificationCodeService, SysTenantMapper sysTenantMapper) { this.orderMapper = orderMapper; this.orderItemMapper = orderItemMapper; this.skuMapper = skuMapper;