From 3d47ca033f4fa8de44f5fa709ac3c40486cb1831 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 09 八月 2024 09:38:44 +0800
Subject: [PATCH] 优惠券管理代码提交
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 13 ++++++-------
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 3 ---
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
index 43c0f6d..2a10521 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -30,7 +30,4 @@
private Integer waysToObtain;
@ApiModelProperty(value = " 是否删除0否1是")
private Integer delFlag;
- @ApiModelProperty(value = "三方支付流水号 前端忽略")
- private String serialNumber;
-
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
index 6bc6d16..0676e0f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -32,23 +32,23 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
PageInfo<ExchangeRecordVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<ExchangeRecordVO> list = this.baseMapper.pageList(pageInfo,dto);
- // 现金优惠券
+ // 现金优惠券订单
StringBuilder stringBuilder = new StringBuilder();
- // 积分优惠券
+ // 积分优惠券订单
StringBuilder stringBuilder1 = new StringBuilder();
for (ExchangeRecordVO exchangeRecordVO : list) {
switch (exchangeRecordVO.getWaysToObtain()){
case 1:
- if (exchangeRecordVO.getSerialNumber()!=null){
- stringBuilder.append(exchangeRecordVO.getSerialNumber()).append(",");
+ if (exchangeRecordVO.getOrderId()!=null){
+ stringBuilder.append(exchangeRecordVO.getOrderId()).append(",");
}else{
stringBuilder.append("0").append(",");
}
break;
case 2:
- if (exchangeRecordVO.getSerialNumber()!=null){
- stringBuilder1.append(exchangeRecordVO.getSerialNumber()).append(",");
+ if (exchangeRecordVO.getOrderId()!=null){
+ stringBuilder1.append(exchangeRecordVO.getOrderId()).append(",");
}else{
stringBuilder1.append("0").append(",");
}
@@ -80,7 +80,6 @@
exchangeRecordVO.setStatus(2);
}
}
- // 根据购买方式 查询对应订单号
}
// 去除最后一个字符
--
Gitblit v1.7.1