소스 검색

fix

photo
winter 1 년 전
부모
커밋
99d6b9e58d
4개의 변경된 파일23개의 추가작업 그리고 1개의 파일을 삭제
  1. +1
    -1
      suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +10
    -0
      suimangAdmin/src/main/java/com/iformall/controller/sm/ProductOrderController.java
  3. +8
    -0
      suimangAdmin/src/main/java/com/iformall/controller/sm/UserMouldVideoController.java
  4. +4
    -0
      suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java

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


+ 10
- 0
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<Long> cUserIds = wxCUserBasicInfoService.findIdsListByPhone(null, record.getPhone());
if (null == cUserIds || cUserIds.size() <= 0 ) {


+ 8
- 0
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<UserMouldVideo> page = userMouldVideoService.listAsPage(record, PageNum, PageSize);
return new ResultData(page);


+ 4
- 0
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());


불러오는 중...
취소
저장