diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java index 746951b..3d01df4 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java @@ -80,6 +80,7 @@ public class TbCashierCart implements Serializable { private Integer isMember; private static final long serialVersionUID = 1L; + private String useCouponInfo; public String getSkuName() { if(StringUtils.isNotBlank(skuName)){ @@ -112,4 +113,12 @@ public class TbCashierCart implements Serializable { return BigDecimal.valueOf(num).multiply(salePrice); } } + + public void setUseCouponInfo(String useCouponInfo) { + this.useCouponInfo = useCouponInfo; + } + + public String getUseCouponInfo() { + return useCouponInfo; + } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java index e7aa0b1..b356312 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java @@ -49,5 +49,6 @@ public class TbOrderDetail implements Serializable { private static final long serialVersionUID = 1L; private Integer isMember; + private String useCouponInfo; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index c640c55..d92266b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1131,6 +1131,7 @@ public class CartService { } orderDetail.setOrderId(orderId); orderDetail.setIsMember(cashierCart.getIsMember()); + orderDetail.setUseCouponInfo(cashierCart.getUseCouponInfo()); priceDTO.getOrderDetailList().add(orderDetail); } @@ -1207,6 +1208,7 @@ public class CartService { tbActivateOutRecord.setCreateTime(DateUtil.date()); tbActivateOutRecord.setRefNum(0); outRecords.add(tbActivateOutRecord); + cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord)); couponVo.setFinalDiscountAmount(discountAmount); // 优惠券未消耗完毕