czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 优惠券返回名称字段

This commit is contained in:
张松 2024-11-06 10:41:18 +08:00
parent eee972193c
commit 4982d22e5a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java
View File

@ -18,6 +18,7 @@ import java.util.List;
public interface TbActivateInRecordMapper extends BaseMapper<TbActivateInRecord> { public interface TbActivateInRecordMapper extends BaseMapper<TbActivateInRecord> {
@Select("SELECT" + @Select("SELECT" +
" pro.name as productName, " +
" inRecord.id as id," + " inRecord.id as id," +
" inRecord.full_amount as fullAmount," + " inRecord.full_amount as fullAmount," +
" inRecord.discount_amount as discountAmount," + " inRecord.discount_amount as discountAmount," +

2
eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java
View File

@ -14,6 +14,8 @@ public class TbUserCouponVo {
private Integer proId; private Integer proId;
//优惠券名称 //优惠券名称
private String name; private String name;
// 商品名称
private String productName;
//优惠券类型 1 满减 2 商品券 //优惠券类型 1 满减 2 商品券
private Integer type; private Integer type;
//数量 //数量