From 5e3a8d5f61d0afb04ac9c657effc7660e052f951 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 7 Nov 2023 11:07:48 +0800 Subject: [PATCH] fix --- .../com/iformall/shiro/PasswordHelper.java | 4 +- .../service/impl/WxTopicServiceImpl.java | 50 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java index 73b38e436..74d0613be 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java @@ -23,8 +23,8 @@ public class PasswordHelper { public static void main(String[] args) { MallUserInfo user = new MallUserInfo(); - user.setUsername("fmoperator"); - user.setPassword("fm202008admin"); + user.setUsername("weiyeadmin"); + user.setPassword("123456abc"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(user); System.out.println(user); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 70e4d12c0..70e760ddf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -169,34 +169,34 @@ public class WxTopicServiceImpl implements WxTopicService { if(showBeginTime == null){ showBeginTime = new Date(); } - if(wxCoupon.getSoldStartTime() != null && wxCoupon.getSoldEndTime() != null){ - if(showBeginTime.after(wxCoupon.getSoldEndTime())){ - throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]上架时间不得晚于售卖结束时间"); - } - if(beginTime == null){ - beginTime = wxCoupon.getSoldStartTime(); - } - if(beginTime.before(wxCoupon.getSoldStartTime())){ - throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]活动开始时间不得早于售卖开始时间"); - } - if(endTime == null){ - endTime = wxCoupon.getSoldEndTime(); - } - if(endTime.after(wxCoupon.getSoldEndTime())){ - throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]活动结束时间不得晚于售卖结束时间"); - } - } +// if(wxCoupon.getSoldStartTime() != null && wxCoupon.getSoldEndTime() != null){ +// if(showBeginTime.after(wxCoupon.getSoldEndTime())){ +// throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]上架时间不得晚于售卖结束时间"); +// } +// if(beginTime == null){ +// beginTime = wxCoupon.getSoldStartTime(); +// } +// if(beginTime.before(wxCoupon.getSoldStartTime())){ +// throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]活动开始时间不得早于售卖开始时间"); +// } +// if(endTime == null){ +// endTime = wxCoupon.getSoldEndTime(); +// } +// if(endTime.after(wxCoupon.getSoldEndTime())){ +// throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]活动结束时间不得晚于售卖结束时间"); +// } +// } if(beginTime == null){ beginTime = showBeginTime; } - if(EnumCouponValidType.BETWEEN_TWO_TIME.getCode().equals(wxCoupon.getValidType())){ - if(endTime == null){ - endTime = wxCoupon.getValidEndDate(); - } - if(endTime.after(wxCoupon.getValidEndDate())){ - throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]活动结束时间不得晚于有效期结束时间"); - } - } +// if(EnumCouponValidType.BETWEEN_TWO_TIME.getCode().equals(wxCoupon.getValidType())){ +// if(endTime == null){ +// endTime = wxCoupon.getValidEndDate(); +// } +// if(endTime.after(wxCoupon.getValidEndDate())){ +// throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED.getCode(),"["+wxCoupon.getTitle()+"]活动结束时间不得晚于有效期结束时间"); +// } +// } WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.updateTenantInfo(record);