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-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/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 77% 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 e202de89b..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,12 +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.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 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; @@ -26,6 +26,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 +38,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/transaction/controller/DivideRuleController.java similarity index 73% 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 30e10a537..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; @@ -42,13 +37,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/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 82% 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 c7343fc05..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,13 +1,15 @@ -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; 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/transaction/domain/bo/DivideDetailBO.java similarity index 90% 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 cc8afa143..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; @@ -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/transaction/domain/bo/DivideRuleBO.java similarity index 85% 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 b2e292a2b..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,12 +1,15 @@ -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; +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/transaction/domain/bo/DivideRuleDetailBO.java similarity index 80% 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 eb67b0b85..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; @@ -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/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 95% 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 d06464a66..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; @@ -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/DivideDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java similarity index 87% 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 a444e9a5f..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,8 +1,9 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.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; 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 91% 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 be5700576..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,8 +1,9 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.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/transaction/domain/po/DivideRuleDetail.java similarity index 82% 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 2531fa209..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,8 +1,9 @@ -package com.wzj.soopin.transation.domain.po; +package com.wzj.soopin.transaction.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/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 94% 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 0ce4197e2..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; @@ -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/transaction/domain/vo/DivideDetailVO.java similarity index 90% 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 be35356ba..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,10 +1,11 @@ -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; @@ -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/transaction/domain/vo/DivideRuleDetailVO.java similarity index 80% 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 34f0d7ab5..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,10 +1,11 @@ -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; @@ -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/transaction/domain/vo/DivideRuleVO.java similarity index 70% 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 380286328..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,10 +1,13 @@ -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.util.ArrayList; +import java.util.List; /** * 分账规则 @@ -14,7 +17,7 @@ import org.dromara.common.core.domain.model.BaseAudit; */ @Schema(description="分账规则") @Data -public class DivideRuleVO extends BaseAudit { +public class DivideRuleVO extends BaseEntity { /** * 主键 @@ -23,6 +26,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 +66,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/transaction/domain/vo/DivideVO.java similarity index 86% 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 3658137e1..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,12 +1,13 @@ -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.List; /** * 订单分账 @@ -16,7 +17,7 @@ import java.math.BigDecimal; */ @Schema(description = "订单分账") @Data -public class DivideVO extends BaseAudit { +public class DivideVO extends BaseEntity { /** * 主键 @@ -32,6 +33,8 @@ public class DivideVO extends BaseAudit { @ExcelProperty(value = "分账规则id", order = 2) private Long ruleId; + private String ruleName; + /** @@ -78,5 +81,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/transaction/domain/vo/WithdrawVO.java similarity index 94% 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 85f960b51..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; @@ -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/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/transaction/enums/DivideRuleStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideRuleStatus.java new file mode 100644 index 000000000..ff3da1400 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideRuleStatus.java @@ -0,0 +1,30 @@ +package com.wzj.soopin.transaction.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/transaction/enums/DivideStatus.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideStatus.java new file mode 100644 index 000000000..5a3b62439 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/DivideStatus.java @@ -0,0 +1,23 @@ +package com.wzj.soopin.transaction.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/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/transaction/mapper/DivideMapper.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideMapper.java new file mode 100644 index 000000000..d5118eda3 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/mapper/DivideMapper.java @@ -0,0 +1,15 @@ +package com.wzj.soopin.transaction.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.transaction.domain.po.Divide; +import com.wzj.soopin.transaction.domain.vo.DivideVO; + +/** + * 意见反馈Mapper接口 + * + * @author zcc + */ +public interface DivideMapper extends BaseMapper { + + DivideVO getVOById( Long divideId); +} 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/transaction/service/impl/DivideRuleServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleServiceImpl.java new file mode 100644 index 000000000..4962d8cfc --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideRuleServiceImpl.java @@ -0,0 +1,99 @@ +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.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; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.List; + +/** + * 分账服务实现类 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@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/transaction/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java new file mode 100644 index 000000000..cc62aaf10 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java @@ -0,0 +1,98 @@ +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.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; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.List; + +/** + * 分账服务实现类 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@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/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 d566fd9f9..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideDetailMapper.java +++ /dev/null @@ -1,14 +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; - -/** - * 意见反馈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 deleted file mode 100644 index 847c37c67..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 7866e9bbe..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/mapper/DivideRuleDetailMapper.java +++ /dev/null @@ -1,14 +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; - -/** - * 意见反馈Mapper接口 - * - * @author zcc - */ -public interface DivideRuleDetailMapper extends BaseMapper { - -} 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 baaf56a30..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideRuleService.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.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 deleted file mode 100644 index acbe7fe34..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/IDivideService.java +++ /dev/null @@ -1,8 +0,0 @@ -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/impl/DivideRuleServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java deleted file mode 100644 index b7b511253..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideRuleServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 7145ca21d..000000000 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transation/service/impl/DivideServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -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-transaction/src/main/resources/mapper/transaction/DivideMapper.xml b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml new file mode 100644 index 000000000..c5d30acd8 --- /dev/null +++ b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml @@ -0,0 +1,28 @@ + + + + + +