From b36a96a2241968732e33b2287a6bbe2f82d889ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:42:24 +0800
Subject: [PATCH] 开发确认购物车订单逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java
index 97fa4c6..eac7acd 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.vo.CouponInfoVo;
+import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import com.ruoyi.account.mapper.UserCouponMapper;
import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.service.UserCouponService;
@@ -40,7 +41,7 @@
* @return
*/
@Override
- public List<CouponInfoVo> getUserCoupon(Long userId, BigDecimal orderMoney, Integer type) {
+ public List<PaymentUserCouponVo> getUserCoupon(Long userId, BigDecimal orderMoney, Integer type) {
List<UserCoupon> list = this.list(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getDelFlag, 0)
.last(" and now() between start_time and end_time"));
List<Integer> couponIds = list.stream().map(UserCoupon::getCouponId).collect(Collectors.toList());
@@ -50,10 +51,10 @@
List<CouponInfo> couponInfoList = couponInfoClient.getCouponInfoList(couponIds).getData();
//构建返回数据
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- List<CouponInfoVo> infoVoList = new ArrayList<>();
+ List<PaymentUserCouponVo> infoVoList = new ArrayList<>();
for (UserCoupon userCoupon : list) {
CouponInfo couponInfo = couponInfoList.stream().filter(s -> s.getId().equals(userCoupon.getCouponId())).findFirst().get();
- CouponInfoVo couponInfoVo = new CouponInfoVo();
+ PaymentUserCouponVo couponInfoVo = new PaymentUserCouponVo();
couponInfoVo.setId(userCoupon.getId());
couponInfoVo.setName(couponInfo.getCouponName());
couponInfoVo.setCouponType(couponInfo.getCouponType());
--
Gitblit v1.7.1