Skip to content

T
travel-cloud
提交 509e08b2 authored 作者: hzh's avatar hzh
浏览文件
操作

订单部分功能实现

上级 a5c772bd
隐藏空白字符变更
内嵌 并排
正在显示 包含 1400 行增加 和 0 行删除
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/OrderController.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.order.domain.bo.OrderBo;
import org.dromara.order.domain.vo.OrderVo;
import org.dromara.order.service.IOrderService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 订单费用
* 前端访问路由地址为:/order/order
*
* @author hzh
* @date 2024-12-05
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/order")
public class OrderController extends BaseController {
private final IOrderService orderService;
/**
* 查询订单费用列表
*/
@SaCheckPermission("order:order:list")
@GetMapping("/list")
public TableDataInfo<OrderVo> list(OrderBo bo, PageQuery pageQuery) {
return orderService.queryPageList(bo, pageQuery);
}
/**
* 导出订单费用列表
*/
@SaCheckPermission("order:order:export")
@Log(title = "订单费用", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OrderBo bo, HttpServletResponse response) {
List<OrderVo> list = orderService.queryList(bo);
ExcelUtil.exportExcel(list, "订单费用", OrderVo.class, response);
}
/**
* 获取订单费用详细信息
*
* @param id 主键
*/
@SaCheckPermission("order:order:query")
@GetMapping("/{id}")
public R<OrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(orderService.queryById(id));
}
/**
* 新增订单费用
*/
@SaCheckPermission("order:order:add")
@Log(title = "订单费用", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderBo bo) {
return toAjax(orderService.insertByBo(bo));
}
/**
* 修改订单费用
*/
@SaCheckPermission("order:order:edit")
@Log(title = "订单费用", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderBo bo) {
return toAjax(orderService.updateByBo(bo));
}
/**
* 删除订单费用
*
* @param ids 主键串
*/
@SaCheckPermission("order:order:remove")
@Log(title = "订单费用", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(orderService.deleteWithValidByIds(List.of(ids), true));
}
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/Order.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/**
* 订单费用对象 biz_order
*
* @author hzh
* @date 2024-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("biz_order")
public class Order extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 微信用户id
*/
private Long userId;
/**
* 来源
*/
private String source;
/**
* 订单类型
*/
private String orderType;
/**
* 原始订单编号
*/
private String originOrderNo;
/**
* 订单编号
*/
private String orderNo;
/**
* 订单支付编号
*/
private String orderPayNo;
/**
* 金额
*/
private BigDecimal amount;
/**
* 需支付金额（分）
*/
private BigDecimal payAmount;
/**
* 实际支付金额（分）
*/
private BigDecimal actualPayAmount;
/**
* 优惠金额（分）
*/
private BigDecimal discountAmount;
/**
* 支付完成时间
*/
private Date payTime;
/**
* 其他信息
*/
private String otherInfo;
/**
* 状态
*/
private String status;
/**
* 备注
*/
private String remark;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderFee.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 订单费用对象 biz_order_fee
*
* @author hzh
* @date 2024-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("biz_order_fee")
public class OrderFee extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 微信用户id
*/
private Long userId;
/**
* 订单编号
*/
private String orderNo;
/**
* 费用描述
*/
private String feeDesc;
/**
* 费用类型
*/
private String feeType;
/**
* 费用金额
*/
private BigDecimal feeAmount;
/**
* 其他信息
*/
private String otherInfo;
/**
* 备注
*/
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderTrade.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/**
* 实际支付订单对象 biz_order_trade
*
* @author hzh
* @date 2024-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("biz_order_trade")
public class OrderTrade extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 用户id
*/
private Long userId;
/**
* 订单编号
*/
private String orderNo;
/**
* 订单支付编号
*/
private String orderPayNo;
/**
* 微信支付订单号
*/
private String transactionId;
/**
* 金额
*/
private BigDecimal amount;
/**
* 需支付金额（分）
*/
private BigDecimal payAmount;
/**
* 实际支付金额（分）
*/
private BigDecimal actualPayAmount;
/**
* 优惠金额（分）
*/
private BigDecimal discountAmount;
/**
* 支付类型
*/
private String payType;
/**
* 支付渠道
*/
private String payChannel;
/**
* 交易类型
*/
private String tradeType;
/**
* 交易状态
*/
private String tradeState;
/**
* 通知返回明文信息
*/
private String tradeInfo;
/**
* 支付流水号
*/
private String paySerialNumber;
/**
* 支付创建时间
*/
private Date payCreateTime;
/**
* 支付完成时间
*/
private Date payTime;
/**
* 订单失效时间
*/
private Date expireTime;
/**
* 支付用户openId
*/
private String payOpenId;
/**
* 备注
*/
private String remark;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderBo.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.order.domain.Order;
import java.math.BigDecimal;
import java.util.Date;
/**
* 订单费用业务对象 biz_order
*
* @author hzh
* @date 2024-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = Order.class, reverseConvertGenerate = false)
public class OrderBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = {EditGroup.class})
private Long id;
/**
* 微信用户id
*/
@NotNull(message = "微信用户id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 来源
*/
@NotBlank(message = "来源不能为空", groups = {AddGroup.class, EditGroup.class})
private String source;
/**
* 订单类型
*/
@NotBlank(message = "订单类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderType;
/**
* 原始订单编号
*/
@NotBlank(message = "原始订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String originOrderNo;
/**
* 订单编号
*/
@NotBlank(message = "订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderNo;
/**
* 订单支付编号
*/
@NotBlank(message = "订单支付编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderPayNo;
/**
* 金额
*/
@NotNull(message = "金额不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal amount;
/**
* 需支付金额（分）
*/
@NotNull(message = "需支付金额（分）不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal payAmount;
/**
* 实际支付金额（分）
*/
@NotNull(message = "实际支付金额（分）不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal actualPayAmount;
/**
* 优惠金额（分）
*/
@NotNull(message = "优惠金额（分）不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal discountAmount;
/**
* 支付完成时间
*/
@NotNull(message = "支付完成时间不能为空", groups = {AddGroup.class, EditGroup.class})
private Date payTime;
/**
* 其他信息
*/
@NotBlank(message = "其他信息不能为空", groups = {AddGroup.class, EditGroup.class})
private String otherInfo;
/**
* 状态
*/
@NotBlank(message = "状态不能为空", groups = {AddGroup.class, EditGroup.class})
private String status;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderFeeBo.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.order.domain.OrderFee;
import java.math.BigDecimal;
/**
* 订单费用业务对象 biz_order_fee
*
* @author hzh
* @date 2024-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = OrderFee.class, reverseConvertGenerate = false)
public class OrderFeeBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = {EditGroup.class})
private Long id;
/**
* 微信用户id
*/
@NotNull(message = "微信用户id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 订单编号
*/
@NotBlank(message = "订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderNo;
/**
* 费用描述
*/
@NotBlank(message = "费用描述不能为空", groups = {AddGroup.class, EditGroup.class})
private String feeDesc;
/**
* 费用类型
*/
@NotBlank(message = "费用类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String feeType;
/**
* 费用金额
*/
@NotNull(message = "费用金额不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal feeAmount;
/**
* 其他信息
*/
@NotBlank(message = "其他信息不能为空", groups = {AddGroup.class, EditGroup.class})
private String otherInfo;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderTradeBo.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.order.domain.OrderTrade;
import java.math.BigDecimal;
import java.util.Date;
/**
* 实际支付订单业务对象 biz_order_trade
*
* @author hzh
* @date 2024-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = OrderTrade.class, reverseConvertGenerate = false)
public class OrderTradeBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = {EditGroup.class})
private Long id;
/**
* 用户id
*/
@NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 订单编号
*/
@NotBlank(message = "订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderNo;
/**
* 订单支付编号
*/
@NotBlank(message = "订单支付编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderPayNo;
/**
* 微信支付订单号
*/
@NotBlank(message = "微信支付订单号不能为空", groups = {AddGroup.class, EditGroup.class})
private String transactionId;
/**
* 金额
*/
@NotNull(message = "金额不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal amount;
/**
* 需支付金额（分）
*/
@NotNull(message = "需支付金额（分）不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal payAmount;
/**
* 实际支付金额（分）
*/
@NotNull(message = "实际支付金额（分）不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal actualPayAmount;
/**
* 优惠金额（分）
*/
@NotNull(message = "优惠金额（分）不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal discountAmount;
/**
* 支付类型
*/
@NotBlank(message = "支付类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String payType;
/**
* 支付渠道
*/
@NotBlank(message = "支付渠道不能为空", groups = {AddGroup.class, EditGroup.class})
private String payChannel;
/**
* 交易类型
*/
@NotBlank(message = "交易类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String tradeType;
/**
* 交易状态
*/
@NotBlank(message = "交易状态不能为空", groups = {AddGroup.class, EditGroup.class})
private String tradeState;
/**
* 通知返回明文信息
*/
@NotBlank(message = "通知返回明文信息不能为空", groups = {AddGroup.class, EditGroup.class})
private String tradeInfo;
/**
* 支付流水号
*/
@NotBlank(message = "支付流水号不能为空", groups = {AddGroup.class, EditGroup.class})
private String paySerialNumber;
/**
* 支付创建时间
*/
@NotNull(message = "支付创建时间不能为空", groups = {AddGroup.class, EditGroup.class})
private Date payCreateTime;
/**
* 支付完成时间
*/
@NotNull(message = "支付完成时间不能为空", groups = {AddGroup.class, EditGroup.class})
private Date payTime;
/**
* 订单失效时间
*/
@NotNull(message = "订单失效时间不能为空", groups = {AddGroup.class, EditGroup.class})
private Date expireTime;
/**
* 支付用户openId
*/
@NotBlank(message = "支付用户openId不能为空", groups = {AddGroup.class, EditGroup.class})
private String payOpenId;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderFeeVo.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.order.domain.OrderFee;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 订单费用视图对象 biz_order_fee
*
* @author hzh
* @date 2024-12-05
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = OrderFee.class)
public class OrderFeeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 微信用户id
*/
@ExcelProperty(value = "微信用户id")
private Long userId;
/**
* 订单编号
*/
@ExcelProperty(value = "订单编号")
private String orderNo;
/**
* 费用描述
*/
@ExcelProperty(value = "费用描述")
private String feeDesc;
/**
* 费用类型
*/
@ExcelProperty(value = "费用类型")
private String feeType;
/**
* 费用金额
*/
@ExcelProperty(value = "费用金额")
private BigDecimal feeAmount;
/**
* 其他信息
*/
@ExcelProperty(value = "其他信息")
private String otherInfo;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderTradeVo.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.order.domain.OrderTrade;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 实际支付订单视图对象 biz_order_trade
*
* @author hzh
* @date 2024-12-05
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = OrderTrade.class)
public class OrderTradeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 用户id
*/
@ExcelProperty(value = "用户id")
private Long userId;
/**
* 订单编号
*/
@ExcelProperty(value = "订单编号")
private String orderNo;
/**
* 订单支付编号
*/
@ExcelProperty(value = "订单支付编号")
private String orderPayNo;
/**
* 微信支付订单号
*/
@ExcelProperty(value = "微信支付订单号")
private String transactionId;
/**
* 金额
*/
@ExcelProperty(value = "金额")
private BigDecimal amount;
/**
* 需支付金额（分）
*/
@ExcelProperty(value = "需支付金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "分=")
private BigDecimal payAmount;
/**
* 实际支付金额（分）
*/
@ExcelProperty(value = "实际支付金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "分=")
private BigDecimal actualPayAmount;
/**
* 优惠金额（分）
*/
@ExcelProperty(value = "优惠金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "分=")
private BigDecimal discountAmount;
/**
* 支付类型
*/
@ExcelProperty(value = "支付类型")
private String payType;
/**
* 支付渠道
*/
@ExcelProperty(value = "支付渠道")
private String payChannel;
/**
* 交易类型
*/
@ExcelProperty(value = "交易类型")
private String tradeType;
/**
* 交易状态
*/
@ExcelProperty(value = "交易状态")
private String tradeState;
/**
* 通知返回明文信息
*/
@ExcelProperty(value = "通知返回明文信息")
private String tradeInfo;
/**
* 支付流水号
*/
@ExcelProperty(value = "支付流水号")
private String paySerialNumber;
/**
* 支付创建时间
*/
@ExcelProperty(value = "支付创建时间")
private Date payCreateTime;
/**
* 支付完成时间
*/
@ExcelProperty(value = "支付完成时间")
private Date payTime;
/**
* 订单失效时间
*/
@ExcelProperty(value = "订单失效时间")
private Date expireTime;
/**
* 支付用户openId
*/
@ExcelProperty(value = "支付用户openId")
private String payOpenId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderVo.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.order.domain.Order;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 订单费用视图对象 biz_order
*
* @author hzh
* @date 2024-12-05
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = Order.class)
public class OrderVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 微信用户id
*/
@ExcelProperty(value = "微信用户id")
private Long userId;
/**
* 来源
*/
@ExcelProperty(value = "来源")
private String source;
/**
* 订单类型
*/
@ExcelProperty(value = "订单类型")
private String orderType;
/**
* 原始订单编号
*/
@ExcelProperty(value = "原始订单编号")
private String originOrderNo;
/**
* 订单编号
*/
@ExcelProperty(value = "订单编号")
private String orderNo;
/**
* 订单支付编号
*/
@ExcelProperty(value = "订单支付编号")
private String orderPayNo;
/**
* 金额
*/
@ExcelProperty(value = "金额")
private BigDecimal amount;
/**
* 需支付金额（分）
*/
@ExcelProperty(value = "需支付金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "分=")
private BigDecimal payAmount;
/**
* 实际支付金额（分）
*/
@ExcelProperty(value = "实际支付金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "分=")
private BigDecimal actualPayAmount;
/**
* 优惠金额（分）
*/
@ExcelProperty(value = "优惠金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "分=")
private BigDecimal discountAmount;
/**
* 支付完成时间
*/
@ExcelProperty(value = "支付完成时间")
private Date payTime;
/**
* 其他信息
*/
@ExcelProperty(value = "其他信息")
private String otherInfo;
/**
* 状态
*/
@ExcelProperty(value = "状态")
private String status;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderFeeMapper.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.order.domain.OrderFee;
import org.dromara.order.domain.vo.OrderFeeVo;
/**
* 订单费用Mapper接口
*
* @author hzh
* @date 2024-12-05
*/
public interface OrderFeeMapper extends BaseMapperPlus<OrderFee, OrderFeeVo> {
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderMapper.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.order.domain.Order;
import org.dromara.order.domain.vo.OrderVo;
/**
* 订单费用Mapper接口
*
* @author hzh
* @date 2024-12-05
*/
public interface OrderMapper extends BaseMapperPlus<Order, OrderVo> {
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderTradeMapper.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.order.domain.OrderTrade;
import org.dromara.order.domain.vo.OrderTradeVo;
/**
* 实际支付订单Mapper接口
*
* @author hzh
* @date 2024-12-05
*/
public interface OrderTradeMapper extends BaseMapperPlus<OrderTrade, OrderTradeVo> {
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderFeeService.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.service;
import org.dromara.order.base.IBaseService;
import org.dromara.order.domain.OrderFee;
import org.dromara.order.domain.bo.OrderFeeBo;
import org.dromara.order.domain.vo.OrderFeeVo;
/**
* 订单费用Service接口
*
* @author hzh
* @date 2024-12-05
*/
public interface IOrderFeeService extends IBaseService<OrderFeeVo, OrderFeeBo, OrderFee> {
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderService.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.service;
import org.dromara.order.base.IBaseService;
import org.dromara.order.domain.Order;
import org.dromara.order.domain.bo.OrderBo;
import org.dromara.order.domain.vo.OrderVo;
/**
* 订单费用Service接口
*
* @author hzh
* @date 2024-12-05
*/
public interface IOrderService extends IBaseService<OrderVo, OrderBo, Order> {
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderTradeService.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.service;
import org.dromara.order.base.IBaseService;
import org.dromara.order.domain.OrderTrade;
import org.dromara.order.domain.bo.OrderTradeBo;
import org.dromara.order.domain.vo.OrderTradeVo;
/**
* 实际支付订单Service接口
*
* @author hzh
* @date 2024-12-05
*/
public interface IOrderTradeService extends IBaseService<OrderTradeVo, OrderTradeBo, OrderTrade> {
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderFeeServiceImpl.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.order.base.AbstractBaseService;
import org.dromara.order.domain.OrderFee;
import org.dromara.order.domain.bo.OrderFeeBo;
import org.dromara.order.domain.vo.OrderFeeVo;
import org.dromara.order.mapper.OrderFeeMapper;
import org.dromara.order.service.IOrderFeeService;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 订单费用Service业务层处理
*
* @author hzh
* @date 2024-12-05
*/
@RequiredArgsConstructor
@Service
public class OrderFeeServiceImpl extends AbstractBaseService<OrderFeeVo, OrderFeeBo, OrderFee> implements IOrderFeeService {
private final OrderFeeMapper baseMapper;
@Override
public BaseMapperPlus<OrderFee, OrderFeeVo> mapper() {
return baseMapper;
}
@Override
public LambdaQueryWrapper<OrderFee> buildQueryWrapper(OrderFeeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OrderFee> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, OrderFee::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), OrderFee::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getFeeDesc()), OrderFee::getFeeDesc, bo.getFeeDesc());
lqw.eq(StringUtils.isNotBlank(bo.getFeeType()), OrderFee::getFeeType, bo.getFeeType());
lqw.eq(bo.getFeeAmount() != null, OrderFee::getFeeAmount, bo.getFeeAmount());
lqw.eq(StringUtils.isNotBlank(bo.getOtherInfo()), OrderFee::getOtherInfo, bo.getOtherInfo());
return lqw;
}
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderServiceImpl.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.order.base.AbstractBaseService;
import org.dromara.order.domain.Order;
import org.dromara.order.domain.bo.OrderBo;
import org.dromara.order.domain.vo.OrderVo;
import org.dromara.order.mapper.OrderMapper;
import org.dromara.order.service.IOrderService;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 订单费用Service业务层处理
*
* @author hzh
* @date 2024-12-05
*/
@RequiredArgsConstructor
@Service
public class OrderServiceImpl extends AbstractBaseService<OrderVo, OrderBo, Order> implements IOrderService {
private final OrderMapper baseMapper;
@Override
public BaseMapperPlus<Order, OrderVo> mapper() {
return baseMapper;
}
@Override
public LambdaQueryWrapper<Order> buildQueryWrapper(OrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, Order::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getSource()), Order::getSource, bo.getSource());
lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), Order::getOrderType, bo.getOrderType());
lqw.eq(StringUtils.isNotBlank(bo.getOriginOrderNo()), Order::getOriginOrderNo, bo.getOriginOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), Order::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getOrderPayNo()), Order::getOrderPayNo, bo.getOrderPayNo());
lqw.eq(bo.getAmount() != null, Order::getAmount, bo.getAmount());
lqw.eq(bo.getPayAmount() != null, Order::getPayAmount, bo.getPayAmount());
lqw.eq(bo.getActualPayAmount() != null, Order::getActualPayAmount, bo.getActualPayAmount());
lqw.eq(bo.getDiscountAmount() != null, Order::getDiscountAmount, bo.getDiscountAmount());
lqw.eq(bo.getPayTime() != null, Order::getPayTime, bo.getPayTime());
lqw.eq(StringUtils.isNotBlank(bo.getOtherInfo()), Order::getOtherInfo, bo.getOtherInfo());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Order::getStatus, bo.getStatus());
return lqw;
}
}
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderTradeServiceImpl.java 0 → 100644
浏览文件 @ 509e08b2
package org.dromara.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.order.base.AbstractBaseService;
import org.dromara.order.domain.OrderTrade;
import org.dromara.order.domain.bo.OrderTradeBo;
import org.dromara.order.domain.vo.OrderTradeVo;
import org.dromara.order.mapper.OrderTradeMapper;
import org.dromara.order.service.IOrderTradeService;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 实际支付订单Service业务层处理
*
* @author hzh
* @date 2024-12-05
*/
@RequiredArgsConstructor
@Service
public class OrderTradeServiceImpl extends AbstractBaseService<OrderTradeVo, OrderTradeBo, OrderTrade> implements IOrderTradeService {
private final OrderTradeMapper baseMapper;
@Override
public BaseMapperPlus<OrderTrade, OrderTradeVo> mapper() {
return baseMapper;
}
@Override
public LambdaQueryWrapper<OrderTrade> buildQueryWrapper(OrderTradeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OrderTrade> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, OrderTrade::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), OrderTrade::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getOrderPayNo()), OrderTrade::getOrderPayNo, bo.getOrderPayNo());
lqw.eq(StringUtils.isNotBlank(bo.getTransactionId()), OrderTrade::getTransactionId, bo.getTransactionId());
lqw.eq(bo.getAmount() != null, OrderTrade::getAmount, bo.getAmount());
lqw.eq(bo.getPayAmount() != null, OrderTrade::getPayAmount, bo.getPayAmount());
lqw.eq(bo.getActualPayAmount() != null, OrderTrade::getActualPayAmount, bo.getActualPayAmount());
lqw.eq(bo.getDiscountAmount() != null, OrderTrade::getDiscountAmount, bo.getDiscountAmount());
lqw.eq(StringUtils.isNotBlank(bo.getPayType()), OrderTrade::getPayType, bo.getPayType());
lqw.eq(StringUtils.isNotBlank(bo.getPayChannel()), OrderTrade::getPayChannel, bo.getPayChannel());
lqw.eq(StringUtils.isNotBlank(bo.getTradeType()), OrderTrade::getTradeType, bo.getTradeType());
lqw.eq(StringUtils.isNotBlank(bo.getTradeState()), OrderTrade::getTradeState, bo.getTradeState());
lqw.eq(StringUtils.isNotBlank(bo.getTradeInfo()), OrderTrade::getTradeInfo, bo.getTradeInfo());
lqw.eq(StringUtils.isNotBlank(bo.getPaySerialNumber()), OrderTrade::getPaySerialNumber, bo.getPaySerialNumber());
lqw.eq(bo.getPayCreateTime() != null, OrderTrade::getPayCreateTime, bo.getPayCreateTime());
lqw.eq(bo.getPayTime() != null, OrderTrade::getPayTime, bo.getPayTime());
lqw.eq(bo.getExpireTime() != null, OrderTrade::getExpireTime, bo.getExpireTime());
lqw.eq(StringUtils.isNotBlank(bo.getPayOpenId()), OrderTrade::getPayOpenId, bo.getPayOpenId());
return lqw;
}
}
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderFeeMapper.xml 0 → 100644
浏览文件 @ 509e08b2
<?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="org.dromara.order.mapper.OrderFeeMapper">
</mapper>
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml 0 → 100644
浏览文件 @ 509e08b2
<?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="org.dromara.order.mapper.OrderMapper">
</mapper>
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderTradeMapper.xml 0 → 100644
浏览文件 @ 509e08b2
<?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="org.dromara.order.mapper.OrderTradeMapper">
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论