新增ISV修复

1.x
tanghc 5 years ago
parent 952d41f143
commit 36133adf62
  1. 3
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/IsvApi.java
  2. 2
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java

@ -10,6 +10,7 @@ import com.gitee.easyopen.doc.annotation.ApiDocMethod;
import com.gitee.easyopen.util.CopyUtil; import com.gitee.easyopen.util.CopyUtil;
import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.PageInfo;
import com.gitee.fastmybatis.core.query.Query; import com.gitee.fastmybatis.core.query.Query;
import com.gitee.fastmybatis.core.query.Sort;
import com.gitee.fastmybatis.core.util.MapperUtil; import com.gitee.fastmybatis.core.util.MapperUtil;
import com.gitee.sop.adminserver.api.IdParam; import com.gitee.sop.adminserver.api.IdParam;
import com.gitee.sop.adminserver.api.isv.param.IsvInfoFormAdd; import com.gitee.sop.adminserver.api.isv.param.IsvInfoFormAdd;
@ -82,6 +83,7 @@ public class IsvApi {
}) })
PageInfo<IsvInfoVO> pageIsv(IsvPageParam param) { PageInfo<IsvInfoVO> pageIsv(IsvPageParam param) {
Query query = Query.build(param); Query query = Query.build(param);
query.orderby("id", Sort.DESC);
PageInfo<IsvInfo> pageInfo = MapperUtil.query(isvInfoMapper, query); PageInfo<IsvInfo> pageInfo = MapperUtil.query(isvInfoMapper, query);
List<IsvInfo> list = pageInfo.getList(); List<IsvInfo> list = pageInfo.getList();
@ -165,6 +167,7 @@ public class IsvApi {
} }
IsvKeysGenVO isvKeysGenVO = this.createIsvKeys(); IsvKeysGenVO isvKeysGenVO = this.createIsvKeys();
IsvKeys isvKeys = new IsvKeys(); IsvKeys isvKeys = new IsvKeys();
isvKeys.setAppKey(appKey);
CopyUtil.copyPropertiesIgnoreNull(isvKeysGenVO, isvKeys); CopyUtil.copyPropertiesIgnoreNull(isvKeysGenVO, isvKeys);
isvKeysMapper.saveIgnoreNull(isvKeys); isvKeysMapper.saveIgnoreNull(isvKeys);

@ -28,6 +28,8 @@ public class IsvInfo {
/** appKey, 数据库字段:app_key */ /** appKey, 数据库字段:app_key */
private String appKey; private String appKey;
private String secret = "";
/** 1启用,2禁用, 数据库字段:status */ /** 1启用,2禁用, 数据库字段:status */
private Byte status; private Byte status;

Loading…
Cancel
Save