diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java index fd8fd4a43..bc2f7a8ad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java @@ -45,11 +45,11 @@ public class WxCustomizeModuleController extends BaseController { List list = wxCustomizeModuleService.findList(wxCustomizeModule); String msg = ""; if(list == null || list.size() == 0){ - msg = "当前自定义配置无数据!建议先同步默认配置,再进行修改!"; + msg = "当前自定义配置无数据,建议先同步默认配置,再进行修改"; }else if(list.size() < 4 || list.size() > 8){ - msg = "当前自定义配置未生效!为了页面效果,菜单数据控制在4到8条!"; + msg = "注:菜单配置项达到4个方可生效,最多可添加8个菜单配置项"; }else{ - msg = "当前自定义配置已生效!生效可能延时,请100秒后重新进入小程序!"; + msg = "注:配置已生效,请在2分钟后重新登入小程序查看"; } return new ResultData(msg); }catch (Exception e){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 8aa02da01..91b3d0ab3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -486,6 +486,7 @@ public class WxCouponServiceImpl implements WxCouponService { if(couponList != null && couponList.size() > 0){ for (WxCoupon wc:couponList) { if(EnumCouponType.COUPON_GIFT.getCode().equals(wc.getType()) + && EnumCouponValidType.BETWEEN_TWO_TIME.getCode().equals(record.getValidType()) && record.getValidEndDate().before(wc.getValidEndDate())){ return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR_GIFT); }