diff --git a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java index a0091de..89b38cb 100644 --- a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -151,7 +151,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); - filterChainDefinitionMap.put("/**", "anon"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ProductOrderController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ProductOrderController.java index 366e8fb..fc8a7a0 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/ProductOrderController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ProductOrderController.java @@ -11,6 +11,8 @@ import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.pay.PayServiceFactory; import com.iformall.service.pay.service.pay.PayAdapterService; +import com.iformall.utils.DateUtils; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -53,6 +55,14 @@ public class ProductOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_TYPE_ERROR.getCode(),"projectType参数错误"); } + if (null != record.getStartDate()) { + record.setStartDate(DateUtils.stringToDate(DateUtils.format(record.getStartDate())+ " 00:00:00",DateUtils.DATE_TIME_PATTERN)); + } + + if (null != record.getEndDate()) { + record.setEndDate(DateUtils.stringToDate(DateUtils.format(record.getEndDate())+ " 23:59:59",DateUtils.DATE_TIME_PATTERN)); + } + if (StringUtils.isNotBlank(record.getPhone())) { List cUserIds = wxCUserBasicInfoService.findIdsListByPhone(null, record.getPhone()); if (null == cUserIds || cUserIds.size() <= 0 ) { diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/UserMouldVideoController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/UserMouldVideoController.java index 9e33c5d..2915ce8 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/UserMouldVideoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/UserMouldVideoController.java @@ -13,6 +13,8 @@ import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.sm.MouldPatchService; import com.iformall.service.sm.MouldPatchSignService; import com.iformall.service.sm.UserMouldVideoService; +import com.iformall.utils.DateUtils; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -55,7 +57,13 @@ public class UserMouldVideoController extends BaseController { record.setCUserIds(cUserIds); } } + if (null != record.getStartDate()) { + record.setStartDate(DateUtils.stringToDate(DateUtils.format(record.getStartDate())+ " 00:00:00",DateUtils.DATE_TIME_PATTERN)); + } + if (null != record.getEndDate()) { + record.setEndDate(DateUtils.stringToDate(DateUtils.format(record.getEndDate())+ " 23:59:59",DateUtils.DATE_TIME_PATTERN)); + } record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = userMouldVideoService.listAsPage(record, PageNum, PageSize); return new ResultData(page); diff --git a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index d3d517e..f186552 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -206,6 +206,10 @@ public class WxUserGrantController extends BaseController { if (!encryptPassword.equals(basicInfo.getPassword())) { return new ResultData(ErrorCode.USER_PASSWD_ERR.getCode(), "手机号或密码错误"); } + + if (EnumCUserBasicInfoStatus.LOCKED.getCode().equals(basicInfo.getStatus())) { + return new ResultData(ErrorCode.MEMBER_IS_LOCKED.getCode(), "用户已被封禁"); + } wxCUserBasicInfoService.handleLoginUser(basicInfo); Map resultMap = new HashMap(); // resultMap.put("phone", basicInfo.getPhone());