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)