From 1555e5d4c96bf0aa5ec72cef5ed109e0742df017 Mon Sep 17 00:00:00 2001
From: macro <zhenghong1991@126.com>
Date: Fri, 11 Feb 2022 16:33:19 +0800
Subject: [PATCH] Update ConfirmOrderResult.java

---
 .../portal/domain/ConfirmOrderResult.java     | 107 +++---------------
 1 file changed, 17 insertions(+), 90 deletions(-)

diff --git a/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java b/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java
index 750b337..71c8c97 100644
--- a/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java
+++ b/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java
@@ -2,6 +2,9 @@ package com.macro.mall.portal.domain;
 
 import com.macro.mall.model.UmsIntegrationConsumeSetting;
 import com.macro.mall.model.UmsMemberReceiveAddress;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -10,108 +13,32 @@ import java.util.List;
  * 确认单信息封装
  * Created by macro on 2018/8/30.
  */
+@Getter
+@Setter
 public class ConfirmOrderResult {
-    //包含优惠信息的购物车信息
+    @ApiModelProperty("包含优惠信息的购物车信息")
     private List<CartPromotionItem> cartPromotionItemList;
-    //用户收货地址列表
+    @ApiModelProperty("用户收货地址列表")
     private List<UmsMemberReceiveAddress> memberReceiveAddressList;
-    //用户可用优惠券列表
+    @ApiModelProperty("用户可用优惠券列表")
     private List<SmsCouponHistoryDetail> couponHistoryDetailList;
-    //积分使用规则
+    @ApiModelProperty("积分使用规则")
     private UmsIntegrationConsumeSetting integrationConsumeSetting;
-    //会员持有的积分
+    @ApiModelProperty("会员持有的积分")
     private Integer memberIntegration;
-    //计算的金额
+    @ApiModelProperty("计算的金额")
     private CalcAmount calcAmount;
 
-    public List<CartPromotionItem> getCartPromotionItemList() {
-        return cartPromotionItemList;
-    }
-
-    public void setCartPromotionItemList(List<CartPromotionItem> cartPromotionItemList) {
-        this.cartPromotionItemList = cartPromotionItemList;
-    }
-
-    public List<UmsMemberReceiveAddress> getMemberReceiveAddressList() {
-        return memberReceiveAddressList;
-    }
-
-    public void setMemberReceiveAddressList(List<UmsMemberReceiveAddress> memberReceiveAddressList) {
-        this.memberReceiveAddressList = memberReceiveAddressList;
-    }
-
-    public List<SmsCouponHistoryDetail> getCouponHistoryDetailList() {
-        return couponHistoryDetailList;
-    }
-
-    public void setCouponHistoryDetailList(List<SmsCouponHistoryDetail> couponHistoryDetailList) {
-        this.couponHistoryDetailList = couponHistoryDetailList;
-    }
-
-    public UmsIntegrationConsumeSetting getIntegrationConsumeSetting() {
-        return integrationConsumeSetting;
-    }
-
-    public void setIntegrationConsumeSetting(UmsIntegrationConsumeSetting integrationConsumeSetting) {
-        this.integrationConsumeSetting = integrationConsumeSetting;
-    }
-
-    public Integer getMemberIntegration() {
-        return memberIntegration;
-    }
-
-    public void setMemberIntegration(Integer memberIntegration) {
-        this.memberIntegration = memberIntegration;
-    }
-
-    public CalcAmount getCalcAmount() {
-        return calcAmount;
-    }
-
-    public void setCalcAmount(CalcAmount calcAmount) {
-        this.calcAmount = calcAmount;
-    }
-
+    @Getter
+    @Setter
     public static class CalcAmount{
-        //订单商品总金额
+        @ApiModelProperty("订单商品总金额")
         private BigDecimal totalAmount;
-        //运费
+        @ApiModelProperty("运费")
         private BigDecimal freightAmount;
-        //活动优惠
+        @ApiModelProperty("活动优惠")
         private BigDecimal promotionAmount;
-        //应付金额
+        @ApiModelProperty("应付金额")
         private BigDecimal payAmount;
-
-        public BigDecimal getTotalAmount() {
-            return totalAmount;
-        }
-
-        public void setTotalAmount(BigDecimal totalAmount) {
-            this.totalAmount = totalAmount;
-        }
-
-        public BigDecimal getFreightAmount() {
-            return freightAmount;
-        }
-
-        public void setFreightAmount(BigDecimal freightAmount) {
-            this.freightAmount = freightAmount;
-        }
-
-        public BigDecimal getPromotionAmount() {
-            return promotionAmount;
-        }
-
-        public void setPromotionAmount(BigDecimal promotionAmount) {
-            this.promotionAmount = promotionAmount;
-        }
-
-        public BigDecimal getPayAmount() {
-            return payAmount;
-        }
-
-        public void setPayAmount(BigDecimal payAmount) {
-            this.payAmount = payAmount;
-        }
     }
 }