From e766824acc08c6f66fb41f9d03fbeafcf3093c3f Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 22 五月 2024 09:49:44 +0800 Subject: [PATCH] 提交订单模块支付日志基础代码 --- ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/PaylogMapper.xml | 5 + ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 20 ++++++ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/PaylogMapper.java | 16 +++++ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java | 20 ++++++ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Paylog.java | 62 ++++++++++++++++++++ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java | 16 +++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 3 + ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 2 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 7 ++ 9 files changed, 149 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java index af97846..135b40b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java @@ -1,5 +1,8 @@ package com.ruoyi.system.api.factory; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; +import com.ruoyi.system.api.domain.dto.OrderDTO; import com.ruoyi.system.api.feignClient.OrderClient; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java index 52c5888..2f8268b 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java @@ -111,7 +111,7 @@ Optional.of(goods).ifPresent(goodsSku -> { vo.setGoodsSkuName(goodsSku.getSkuName()); }); - Integer num = orderClient.getSeckillMembers(goodsSeckill.getId()).getData(); + Integer num = orderClient.getSeckillMembers(goodsSeckill.getGoodsSkuId()).getData(); vo.setNumberOfPurchasedMembers(num); return vo; } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java new file mode 100644 index 0000000..78445d3 --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java @@ -0,0 +1,20 @@ +package com.ruoyi.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 支付记录 前端控制器 + * </p> + * + * @author mitao + * @since 2024-05-22 + */ +@RestController +@RequestMapping("/paylog") +public class PaylogController { + +} diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Paylog.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Paylog.java new file mode 100644 index 0000000..f68babb --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Paylog.java @@ -0,0 +1,62 @@ +package com.ruoyi.order.domain.pojo; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * <p> + * 支付记录 + * </p> + * + * @author mitao + * @since 2024-05-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_paylog") +@ApiModel(value="Paylog对象", description="支付记录") +public class Paylog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "商户订单号") + private String outTradeNo; + + private String tradeNo; + + private String buyerId; + + @ApiModelProperty(value = "用户ID") + private Integer uid; + + @ApiModelProperty(value = "支付类型 1=支付宝,2 = 微信") + private Integer payType; + + @ApiModelProperty(value = "支付金额") + private Double payMoney; + + @ApiModelProperty(value = "状态(1=有效,2=无效,3=退款)") + private Integer state; + + private LocalDateTime addTime; + + @ApiModelProperty(value = "支付账号") + private String payAccount; + + @ApiModelProperty(value = "支付状态 ") + private String tradeStatus; + + +} diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/PaylogMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/PaylogMapper.java new file mode 100644 index 0000000..9b14ea9 --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/PaylogMapper.java @@ -0,0 +1,16 @@ +package com.ruoyi.order.mapper; + +import com.ruoyi.order.domain.pojo.Paylog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 支付记录 Mapper 接口 + * </p> + * + * @author mitao + * @since 2024-05-22 + */ +public interface PaylogMapper extends BaseMapper<Paylog> { + +} diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java new file mode 100644 index 0000000..ba443df --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java @@ -0,0 +1,16 @@ +package com.ruoyi.order.service; + +import com.ruoyi.order.domain.pojo.Paylog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * <p> + * 支付记录 服务类 + * </p> + * + * @author mitao + * @since 2024-05-22 + */ +public interface IPaylogService extends IService<Paylog> { + +} diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java index 140f218..07cb825 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java @@ -1,9 +1,13 @@ package com.ruoyi.order.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.enums.OrderStatusEnum; import com.ruoyi.order.domain.pojo.Order; import com.ruoyi.order.mapper.OrderMapper; import com.ruoyi.order.service.IOrderService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.order.util.OrderUtil; +import com.ruoyi.system.api.domain.dto.OrderDTO; +import javax.annotation.Resource; import org.springframework.stereotype.Service; /** @@ -43,4 +47,5 @@ public Integer getSeckillMembers(Long id) { return baseMapper.getSeckillMembers(id); } + } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java new file mode 100644 index 0000000..36a6863 --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java @@ -0,0 +1,20 @@ +package com.ruoyi.order.service.impl; + +import com.ruoyi.order.domain.pojo.Paylog; +import com.ruoyi.order.mapper.PaylogMapper; +import com.ruoyi.order.service.IPaylogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 支付记录 服务实现类 + * </p> + * + * @author mitao + * @since 2024-05-22 + */ +@Service +public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService { + +} diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/PaylogMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/PaylogMapper.xml new file mode 100644 index 0000000..117fd30 --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/PaylogMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ruoyi.order.mapper.PaylogMapper"> + +</mapper> -- Gitblit v1.7.1