From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dto/DiscountExplain.java | 50 +++++++++-----------------------------------------
1 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/DiscountExplain.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/DiscountExplain.java
index fb48cdf..a9519aa 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/DiscountExplain.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/DiscountExplain.java
@@ -1,10 +1,13 @@
package com.matrix.system.shopXcx.dto;
+import lombok.Data;
+
import java.math.BigDecimal;
/**
* 订单优惠说明
*/
+@Data
public class DiscountExplain {
/**
@@ -15,13 +18,13 @@
/**
* 优惠券金额
*/
- private BigDecimal coupon=BigDecimal.ZERO;
+ private BigDecimal couponPrice =BigDecimal.ZERO;
/**
* 活动满减金额
*/
- private BigDecimal activity=BigDecimal.ZERO;
+ private BigDecimal activityPrice =BigDecimal.ZERO;
/**
* 运费
@@ -32,44 +35,9 @@
* 最终支付金额
*/
private BigDecimal payPrice=BigDecimal.ZERO;
+ /**
+ * 最终支付积分
+ */
+ private Integer scorePay;
- public BigDecimal getBillPrice() {
- return billPrice;
- }
-
- public void setBillPrice(BigDecimal billPrice) {
- this.billPrice = billPrice;
- }
-
- public BigDecimal getCoupon() {
- return coupon;
- }
-
- public void setCoupon(BigDecimal coupon) {
- this.coupon = coupon;
- }
-
- public BigDecimal getActivity() {
- return activity;
- }
-
- public void setActivity(BigDecimal activity) {
- this.activity = activity;
- }
-
- public BigDecimal getPostage() {
- return postage;
- }
-
- public void setPostage(BigDecimal postage) {
- this.postage = postage;
- }
-
- public BigDecimal getPayPrice() {
- return payPrice;
- }
-
- public void setPayPrice(BigDecimal payPrice) {
- this.payPrice = payPrice;
- }
}
--
Gitblit v1.9.1