From 0101c47cb8286f831f43d337bae4c07c9c7ed0a2 Mon Sep 17 00:00:00 2001 From: wangguocheng Date: Tue, 21 May 2024 10:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/entity/TbUserCoupons.java | 1 + .../system/cashierservice/service/OrderService.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java index 18f065c..6f59527 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java @@ -16,6 +16,7 @@ public class TbUserCoupons implements Serializable { private BigDecimal couponsPrice; private BigDecimal couponsAmount; + private TbOrderInfo orderInfo; private String status; private String isDouble; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index c1e1477..bad942b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -353,6 +353,10 @@ public class OrderService { public Result getYhqDouble(Integer orderId) { TbUserCoupons userCoupons = userCouponsMapper.selectByOrderId(orderId); + if (Objects.nonNull(userCoupons)){ + TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId); + userCoupons.setOrderInfo(orderInfo); + } return Result.success(CodeEnum.SUCCESS,userCoupons); } @Transactional(rollbackFor = Exception.class)