合并代码;

f534ac4f · zhang_z · e067cdd1 · f534ac4f
Commit f534ac4f authored Dec 27, 2017 by zhang_z
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java +7 -0

No files found.
--- a/app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
+++ b/app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
@@ -1121,6 +1121,13 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
        List<Dis> disList = new ArrayList<>();
        if (dis.getDisAmt() > 0) {
+            disList.add(dis);
+        }
+        if (moneyOff.getDisAmt() > 0) {
+            disList.add(moneyOff);
+        }
+        if (promotion.getDisAmt() > 0) {
+            disList.add(promotion);
        }