From 0ef7e2643effc447af3a4048854e53734daea0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 28 Oct 2025 14:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DistributionController.java | 144 +++++++++--------- .../entity/MkDistributionWithdrawFlow.java | 5 +- .../vo/MkDistributionWithdrawFlowVO.java | 18 +++ .../java/com/czg/utils/MyQueryWrapper.java | 3 + ...MkDistributionWithdrawFlowServiceImpl.java | 9 +- 5 files changed, 99 insertions(+), 80 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDistributionWithdrawFlowVO.java diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java index 6d58bac3..3cbc171d 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java @@ -40,78 +40,78 @@ public class DistributionController { @Resource private AppWxServiceImpl appWxService; - /** - * 配置信息详情 - */ - @SaAdminCheckPermission(value = "distribution:detail", name = "分销配置") - @GetMapping - public CzgResult detail() { - return CzgResult.success(configService.detail(StpKit.USER.getShopId())); - } - - /** - * 配置信息修改 - * - * @return 是否成功 - */ - @SaAdminCheckPermission(value = "distribution:edit", name = "分销修改") - @SaCheckMainShop - @PutMapping - public CzgResult edit( @RequestBody MkDistributionConfigDTO dto) { - return CzgResult.success(configService.edit(StpKit.USER.getShopId(), dto)); - } - - - /** - * 现金充值 - * @param payParam 充值信息 - * @return 是否成功 - */ - @PostMapping("/cashPay") - public CzgResult cashPayOrder(@Validated @RequestBody MkDistributionPayDTO payParam) { - AssertUtil.isNull(payParam.getShopId(), "店铺id不能为空"); - AssertUtil.isNull(payParam.getAmount(), "充值金额不能为空"); - AssertUtil.isTrue(payParam.getAmount().compareTo(BigDecimal.ZERO) == 0, "金额不为0"); - return CzgResult.success(distributionUserService.cashPayOrder(StpKit.USER.getLoginIdAsLong(), payParam)); - } - - /** - * 金额记录 - * @param type manual_recharge充值 self_recharge自助充值 refund退款 manual_sub手动扣减 sub统扣减 - * @param key 搜索 - */ - @GetMapping("/flow") - public CzgResult> flow(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String type, @RequestParam(required = false) String key) { - return CzgResult.success(distributionAmountFlowService.pageInfo(StpKit.USER.isAdmin() ? shopId : StpKit.USER.getShopId(), type, key)); - } - - /** - * 开通记录 - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param key 用户id昵称 - */ - @GetMapping("openFlow") - public CzgResult> openFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String key) { - return CzgResult.success(distributionAmountFlowService.openPageInfo(StpKit.USER.getShopId(), - StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key)); - } - - - /** - * 分销明细 - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param key 用户id昵称 - * @param status pending待入账 success已入账 - */ - @GetMapping("distributionFlow") - public CzgResult> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, - @RequestParam(required = false) String key, @RequestParam(required = false) String status, - @RequestParam(required = false) Long id) { - return CzgResult.success(distributionFlowService.pageInfo(StpKit.USER.getShopId(), - StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status, id)); - } +// /** +// * 配置信息详情 +// */ +// @SaAdminCheckPermission(value = "distribution:detail", name = "分销配置") +// @GetMapping +// public CzgResult detail() { +// return CzgResult.success(configService.detail(StpKit.USER.getShopId())); +// } +// +// /** +// * 配置信息修改 +// * +// * @return 是否成功 +// */ +// @SaAdminCheckPermission(value = "distribution:edit", name = "分销修改") +// @SaCheckMainShop +// @PutMapping +// public CzgResult edit( @RequestBody MkDistributionConfigDTO dto) { +// return CzgResult.success(configService.edit(StpKit.USER.getShopId(), dto)); +// } +// +// +// /** +// * 现金充值 +// * @param payParam 充值信息 +// * @return 是否成功 +// */ +// @PostMapping("/cashPay") +// public CzgResult cashPayOrder(@Validated @RequestBody MkDistributionPayDTO payParam) { +// AssertUtil.isNull(payParam.getShopId(), "店铺id不能为空"); +// AssertUtil.isNull(payParam.getAmount(), "充值金额不能为空"); +// AssertUtil.isTrue(payParam.getAmount().compareTo(BigDecimal.ZERO) == 0, "金额不为0"); +// return CzgResult.success(distributionUserService.cashPayOrder(StpKit.USER.getLoginIdAsLong(), payParam)); +// } +// +// /** +// * 金额记录 +// * @param type manual_recharge充值 self_recharge自助充值 refund退款 manual_sub手动扣减 sub统扣减 +// * @param key 搜索 +// */ +// @GetMapping("/flow") +// public CzgResult> flow(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String type, @RequestParam(required = false) String key) { +// return CzgResult.success(distributionAmountFlowService.pageInfo(StpKit.USER.isAdmin() ? shopId : StpKit.USER.getShopId(), type, key)); +// } +// +// /** +// * 开通记录 +// * @param startTime 开始时间 +// * @param endTime 结束时间 +// * @param key 用户id昵称 +// */ +// @GetMapping("openFlow") +// public CzgResult> openFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String key) { +// return CzgResult.success(distributionAmountFlowService.openPageInfo(StpKit.USER.getShopId(), +// StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key)); +// } +// +// +// /** +// * 分销明细 +// * @param startTime 开始时间 +// * @param endTime 结束时间 +// * @param key 用户id昵称 +// * @param status pending待入账 success已入账 +// */ +// @GetMapping("distributionFlow") +// public CzgResult> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, +// @RequestParam(required = false) String key, @RequestParam(required = false) String status, +// @RequestParam(required = false) Long id) { +// return CzgResult.success(distributionFlowService.pageInfo(StpKit.USER.getShopId(), +// StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status, id)); +// } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java index 5912cf14..3a3dc383 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java @@ -80,9 +80,6 @@ public class MkDistributionWithdrawFlow implements Serializable { private String status; - @Column(ignore = true) - private String nickName; - @Column(ignore = true) - private String phone; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDistributionWithdrawFlowVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDistributionWithdrawFlowVO.java new file mode 100644 index 00000000..79934d96 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDistributionWithdrawFlowVO.java @@ -0,0 +1,18 @@ +package com.czg.market.vo; + +import com.czg.market.entity.MkDistributionWithdrawFlow; +import com.mybatisflex.annotation.Column; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author Administrator + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class MkDistributionWithdrawFlowVO extends MkDistributionWithdrawFlow { + @Column(ignore = true) + private String nickName; + @Column(ignore = true) + private String phone; +} diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java b/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java index 87c06148..181a20cf 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java @@ -1,6 +1,7 @@ package com.czg.utils; import cn.hutool.core.text.NamingCase; +import com.mybatisflex.annotation.Column; import com.mybatisflex.core.constant.SqlConnector; import com.mybatisflex.core.query.*; import com.mybatisflex.core.table.TableInfo; @@ -12,6 +13,7 @@ import com.mybatisflex.core.util.StringUtil; import lombok.extern.slf4j.Slf4j; import java.io.Serializable; +import java.lang.annotation.Annotation; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -30,6 +32,7 @@ public class MyQueryWrapper extends QueryWrapper implements Serializable { TableInfo tableInfo = TableInfoFactory.ofEntityClass(clazz); for (Method declaredMethod : clazz.getDeclaredMethods()) { String methodName = declaredMethod.getName(); + // 只处理 getter：getXxx() / isXxx() if ((methodName.startsWith("get") && methodName.length() > 3) || (methodName.startsWith("is") && methodName.length() > 2)) { diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java index d6cb3cb7..70daeead 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java @@ -6,6 +6,7 @@ import com.czg.account.entity.ShopUser; import com.czg.account.entity.UserInfo; import com.czg.account.service.ShopUserService; import com.czg.constant.TableValueConstant; +import com.czg.market.vo.MkDistributionWithdrawFlowVO; import com.czg.utils.MyQueryWrapper; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; @@ -48,19 +49,19 @@ public class MkDistributionWithdrawFlowServiceImpl extends ServiceImpl { and.or(or -> { - or.like(ShopUser::getId, key); + or.like(UserInfo::getId, key); }); and.or(or -> { - or.like(ShopUser::getNickName, key); + or.like(UserInfo::getNickName, key); }); and.or(or -> { - or.like(ShopUser::getPhone, key); + or.like(UserInfo::getPhone, key); }); }); } - Page page = page(PageUtil.buildPage(), queryWrapper); + Page page = pageAs(PageUtil.buildPage(), queryWrapper, MkDistributionWithdrawFlowVO.class); Map map = BeanUtil.beanToMap(page); map.put("pending", getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getStatus, TableValueConstant.DistributionWithdrawFlow.Status.PENDING.getCode()).select("sum(amount)"))); map.put("finish", getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getStatus, TableValueConstant.DistributionWithdrawFlow.Status.FINISH.getCode()).select("sum(amount)")));