From caeee475205249585172872589a82e4cc42d6ffd 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, 16 Sep 2025 14:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ShopRechargeController.java | 16 ++++ .../com/czg/market/dto/MkRechargeFlowDTO.java | 88 +++++++++++++++++ .../czg/market/entity/MkShopRechargeFlow.java | 96 +++++++++++++++++++ .../market/service/MkRechargeFlowService.java | 16 ++++ .../market/mapper/MkRechargeFlowMapper.java | 14 +++ .../impl/MkRechargeFlowServiceImpl.java | 38 ++++++++ .../resources/mapper/MkRechargeFlowMapper.xml | 7 ++ 7 files changed, 275 insertions(+) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRechargeFlowDTO.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopRechargeFlow.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRechargeFlowService.java create mode 100644 cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkRechargeFlowMapper.java create mode 100644 cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRechargeFlowServiceImpl.java create mode 100644 cash-service/market-service/src/main/resources/mapper/MkRechargeFlowMapper.xml diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java index 50746f24..8d0fcaa1 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java @@ -1,10 +1,13 @@ package com.czg.controller.admin; import com.czg.market.dto.MkShopRechargeDTO; +import com.czg.market.entity.MkShopRechargeFlow; +import com.czg.market.service.MkRechargeFlowService; import com.czg.market.service.MkShopRechargeService; import com.czg.market.vo.MkShopRechargeVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -19,6 +22,8 @@ import org.springframework.web.bind.annotation.*; public class ShopRechargeController { @Resource private MkShopRechargeService shopRechargeService; + @Resource + private MkRechargeFlowService rechargeFlowService; /** * 配置信息获取 @@ -46,5 +51,16 @@ public class ShopRechargeController { return CzgResult.success(shopRechargeService.edit(StpKit.USER.getShopId(), shopRechargeDTO)); } + /** + * 获取充值记录列表 + * @param startTime 开始时间 闭区间 + * @param endTime 结束时间 闭区间 + * @param type 类型 + */ + @GetMapping("/record") + public Page getRecord(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String type) { + return rechargeFlowService.pageInfo(StpKit.USER.getShopId(), startTime, endTime, type); + } + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRechargeFlowDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRechargeFlowDTO.java new file mode 100644 index 00000000..b0bb0900 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRechargeFlowDTO.java @@ -0,0 +1,88 @@ + +package com.czg.market.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.alibaba.fastjson2.annotation.JSONField; +import java.io.Serial; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 充值流水表 实体类。 + * + * @author zs + * @since 2025-09-16 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MkRechargeFlowDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 门店id + */ + private Long shopId; + + /** + * 主店id + */ + private Long masterShopId; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 用户名 + */ + private String nickName; + + /** + * 充值金额 + */ + private BigDecimal amount; + + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 备注 + */ + private String remark; + + /** + * 用户id + */ + private Long userId; + + /** + * 现金充值 recharge_cash +微信充值 recharge_wx +支付宝 recharge_alipay +充值奖励recharge_reward_amount +充值退款 recharge_refund +订单消费 order_cost +订单退款 order_refund +管理员充值 recharge_admin +管理员消费 admin_cost + */ + private String type; + + /** + * 创建时间 + */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopRechargeFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopRechargeFlow.java new file mode 100644 index 00000000..1c3e1031 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopRechargeFlow.java @@ -0,0 +1,96 @@ +package com.czg.market.entity; + +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import java.io.Serial; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 充值流水表 实体类。 + * + * @author zs + * @since 2025-09-16 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("mk_shop_recharge_flow") +public class MkShopRechargeFlow implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 门店id + */ + private Long shopId; + + /** + * 主店id + */ + private Long masterShopId; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 用户名 + */ + private String nickName; + + /** + * 充值金额 + */ + private BigDecimal amount; + + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 备注 + */ + private String remark; + + /** + * 用户id + */ + private Long userId; + + /** + * 现金充值 recharge_cash +微信充值 recharge_wx +支付宝 recharge_alipay +充值奖励recharge_reward_amount +充值退款 recharge_refund +订单消费 order_cost +订单退款 order_refund +管理员充值 recharge_admin +管理员消费 admin_cost + */ + private String type; + + /** + * 创建时间 + */ + @Column(onInsertValue = "now()") + private LocalDateTime createTime; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRechargeFlowService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRechargeFlowService.java new file mode 100644 index 00000000..4b9f95c2 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRechargeFlowService.java @@ -0,0 +1,16 @@ +package com.czg.market.service; + +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.service.IService; +import com.czg.market.entity.MkShopRechargeFlow; + +/** + * 充值流水表 服务层。 + * + * @author zs + * @since 2025-09-16 + */ +public interface MkRechargeFlowService extends IService { + + Page pageInfo(Long shopId, String startTime, String ednTime, String type); +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkRechargeFlowMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkRechargeFlowMapper.java new file mode 100644 index 00000000..c0a9ae44 --- /dev/null +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkRechargeFlowMapper.java @@ -0,0 +1,14 @@ +package com.czg.service.market.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.market.entity.MkShopRechargeFlow; + +/** + * 充值流水表 映射层。 + * + * @author zs + * @since 2025-09-16 + */ +public interface MkRechargeFlowMapper extends BaseMapper { + +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRechargeFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRechargeFlowServiceImpl.java new file mode 100644 index 00000000..44c0f4d0 --- /dev/null +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRechargeFlowServiceImpl.java @@ -0,0 +1,38 @@ +package com.czg.service.market.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.czg.utils.PageUtil; +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.czg.market.entity.MkShopRechargeFlow; +import com.czg.market.service.MkRechargeFlowService; +import com.czg.service.market.mapper.MkRechargeFlowMapper; +import org.springframework.stereotype.Service; + +/** + * 充值流水表 服务层实现。 + * + * @author zs + * @since 2025-09-16 + */ +@Service +public class MkRechargeFlowServiceImpl extends ServiceImpl implements MkRechargeFlowService{ + @Override + public Page pageInfo(Long shopId, String startTime, String ednTime, String type) { + QueryWrapper queryWrapper = new QueryWrapper().eq(MkShopRechargeFlow::getShopId, shopId); + if (StrUtil.isNotBlank(startTime)) { + queryWrapper.ge(MkShopRechargeFlow::getCreateTime, startTime); + } + + if (StrUtil.isNotBlank(ednTime)) { + queryWrapper.le(MkShopRechargeFlow::getCreateTime, ednTime); + } + + if (StrUtil.isNotBlank(type)) { + queryWrapper.eq(MkShopRechargeFlow::getType, type); + } + + return page(PageUtil.buildPage(), queryWrapper.orderBy(MkShopRechargeFlow::getCreateTime, false)); + } +} diff --git a/cash-service/market-service/src/main/resources/mapper/MkRechargeFlowMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkRechargeFlowMapper.xml new file mode 100644 index 00000000..62945807 --- /dev/null +++ b/cash-service/market-service/src/main/resources/mapper/MkRechargeFlowMapper.xml @@ -0,0 +1,7 @@ + + + + +