|
@@ -1,9 +1,6 @@
|
|
|
package com.iamberry.wechat.handles.order;
|
|
|
import java.io.IOException;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
@@ -224,11 +221,17 @@ public class OrderHandler {
|
|
|
flag = false;
|
|
|
}
|
|
|
}
|
|
|
- Date couponUseEndDate = couponItemDto.getCouponUseEndDate();
|
|
|
-
|
|
|
- if((couponUseEndDate.getTime() < new Date().getTime()) ){
|
|
|
- flag = false;
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}else{
|
|
|
flag = false;
|
|
|
}
|
|
@@ -460,7 +463,15 @@ public class OrderHandler {
|
|
|
msg.setMessage(ResultInfo.COUPON_INVALID);
|
|
|
return msg;
|
|
|
}
|
|
|
- if(couponItem.getCouponUseEndDate().getTime()<nowDate.getTime()){
|
|
|
+
|
|
|
+ Date couponUseEndDate = couponItem.getCouponUseEndDate();
|
|
|
+ Calendar nowTime = Calendar.getInstance();
|
|
|
+ nowTime.setTime(couponUseEndDate);
|
|
|
+ nowTime.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
+ nowTime.set(Calendar.MINUTE, 59);
|
|
|
+ nowTime.set(Calendar.SECOND, 59);
|
|
|
+ couponUseEndDate = nowTime.getTime();
|
|
|
+ if(couponUseEndDate.getTime()<nowDate.getTime()){
|
|
|
msg.setMessage(ResultInfo.COUPON_OUTOFDATE);
|
|
|
return msg;
|
|
|
}
|
|
@@ -470,7 +481,6 @@ public class OrderHandler {
|
|
|
msg.setMessage(ResultInfo.COUPON_CONSUME_NO_ENOUGH);
|
|
|
return msg;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
if(couponItemDto.getCouponIsNewPeople() == 1){
|
|
|
if(member.getUserIdentity() != 1 || !brush1Flag || !brush2Flag){
|