winter 2 лет назад
Родитель
Сommit
5e3a8d5f61
2 измененных файлов: 27 добавлений и 27 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java
  2. +25
    -25
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java

+ 2
- 2
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);


+ 25
- 25
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);


Загрузка…
Отмена
Сохранить