From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java
index efc0335..7a43d37 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java
@@ -76,10 +76,19 @@
|| coupon.getType()==null
||coupon.getLimitPrice()==null
||coupon.getPrice()==null
+ ||coupon.getUseType() ==null
||coupon.getNum()==null
+ ||(coupon.getUseType() ==0 &&(
+ coupon.getStartDate()==null
+ ||coupon.getEndDate()==null
+ ))
+ ||(coupon.getUseType() ==1 &&(
+ coupon.getValidDays()==null
+ || coupon.getValidDays()<=0
+ ))
/* ||coupon.getIntegral()==null*/
- ||coupon.getStartDate()==null
- ||coupon.getEndDate()==null
+// ||coupon.getStartDate()==null
+// ||coupon.getEndDate()==null
// ||coupon.getValidDays()==null
){
--
Gitblit v1.9.3