Browse Source

[卷][修改][解析引擎不过滤]

release_toaliyun_real
luozukai 6 years ago
parent
commit
0512486012
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -179,10 +179,10 @@ public class WxCouponController extends BaseController {
if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){
return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR);
} }
if(DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate()))
&& wxCoupon.getInventory().equals(coupon.getInventory())
if((wxCoupon.getValidEndDate()!=null&&coupon.getValidEndDate()!=null && DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate()))
&& wxCoupon.getInventory().equals(coupon.getInventory()))
|| ||
(DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate())) &&
(wxCoupon.getValidDays()!=null && coupon.getValidDays()!=null && wxCoupon.getInventory().equals(coupon.getInventory()) &&
wxCoupon.getValidDays().equals(coupon.getValidDays())) wxCoupon.getValidDays().equals(coupon.getValidDays()))
){ ){
return new ResultData(ErrorCode.COUPON_STOCK_VALID_DATE_SETTING_ERR); return new ResultData(ErrorCode.COUPON_STOCK_VALID_DATE_SETTING_ERR);


Loading…
Cancel
Save