Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
计全科技
jeepay
提交
7482fc5c
jeepay
项目概览
计全科技
/
jeepay
通知
10
Star
3
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
6
Wiki
分析
仓库
DevOps
项目成员
Pages
jeepay
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
6
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7482fc5c
编写于
6月 18, 2021
作者:
Z
zhuxiao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增商户添加默认应用
上级
7b065480
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
6 deletion
+32
-6
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java
.../src/main/java/com/jeequan/jeepay/core/entity/MchApp.java
+1
-1
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java
...om/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java
+2
-0
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
...om/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
+2
-0
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java
.../java/com/jeequan/jeepay/service/impl/MchInfoService.java
+27
-5
未找到文件。
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java
浏览文件 @
7482fc5c
...
...
@@ -36,7 +36,7 @@ public class MchApp extends BaseModel {
/**
* 应用ID
*/
@TableId
(
value
=
"app_id"
,
type
=
IdType
.
ASSIGN_UUID
)
@TableId
(
value
=
"app_id"
,
type
=
IdType
.
INPUT
)
private
String
appId
;
/**
...
...
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java
浏览文件 @
7482fc5c
...
...
@@ -15,6 +15,7 @@
*/
package
com.jeequan.jeepay.mgr.ctrl.merchant
;
import
cn.hutool.core.util.IdUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.jeequan.jeepay.core.aop.MethodLog
;
...
...
@@ -81,6 +82,7 @@ public class MchAppController extends CommonCtrl {
@PostMapping
public
ApiRes
add
()
{
MchApp
mchApp
=
getObject
(
MchApp
.
class
);
mchApp
.
setAppId
(
IdUtil
.
objectId
());
if
(
mchInfoService
.
getById
(
mchApp
.
getMchNo
())
==
null
)
{
return
ApiRes
.
fail
(
ApiCodeEnum
.
SYS_OPERATION_FAIL_SELETE
);
...
...
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
浏览文件 @
7482fc5c
...
...
@@ -15,6 +15,7 @@
*/
package
com.jeequan.jeepay.mch.ctrl.merchant
;
import
cn.hutool.core.util.IdUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.jeequan.jeepay.core.aop.MethodLog
;
...
...
@@ -77,6 +78,7 @@ public class MchAppController extends CommonCtrl {
public
ApiRes
add
()
{
MchApp
mchApp
=
getObject
(
MchApp
.
class
);
mchApp
.
setMchNo
(
getCurrentMchNo
());
mchApp
.
setAppId
(
IdUtil
.
objectId
());
boolean
result
=
mchAppService
.
save
(
mchApp
);
if
(!
result
)
{
...
...
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java
浏览文件 @
7482fc5c
...
...
@@ -15,6 +15,9 @@
*/
package
com.jeequan.jeepay.service.impl
;
import
cn.hutool.core.util.IdUtil
;
import
cn.hutool.core.util.RandomUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.jeequan.jeepay.core.constants.ApiCodeEnum
;
...
...
@@ -85,9 +88,24 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
sysUser
.
setState
(
mchInfo
.
getState
());
sysUserService
.
addSysUser
(
sysUser
,
CS
.
SYS_TYPE
.
MCH
);
// 插入商户默认应用
MchApp
mchApp
=
new
MchApp
();
mchApp
.
setAppId
(
IdUtil
.
objectId
());
mchApp
.
setMchNo
(
mchInfo
.
getMchNo
());
mchApp
.
setAppName
(
"默认应用"
);
mchApp
.
setAppSecret
(
RandomUtil
.
randomString
(
128
));
mchApp
.
setState
(
CS
.
YES
);
mchApp
.
setCreatedBy
(
sysUser
.
getRealname
());
mchApp
.
setCreatedUid
(
sysUser
.
getSysUserId
());
saveResult
=
mchAppService
.
save
(
mchApp
);
if
(!
saveResult
)
throw
new
BizException
(
ApiCodeEnum
.
SYS_OPERATION_FAIL_CREATE
);
// 存入商户默认用户ID
mchInfo
.
setInitUserId
(
sysUser
.
getSysUserId
());
updateById
(
mchInfo
);
MchInfo
updateRecord
=
new
MchInfo
();
updateRecord
.
setMchNo
(
mchInfo
.
getMchNo
());
updateRecord
.
setInitUserId
(
sysUser
.
getSysUserId
());
saveResult
=
updateById
(
updateRecord
);
if
(!
saveResult
)
throw
new
BizException
(
ApiCodeEnum
.
SYS_OPERATION_FAIL_CREATE
);
}
...
...
@@ -118,23 +136,27 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
.
eq
(
SysUser:
:
getBelongInfoId
,
mchNo
)
.
eq
(
SysUser:
:
getSysType
,
CS
.
SYS_TYPE
.
MCH
)
);
// 4.删除当前商户应用信息
mchAppService
.
removeByIds
(
appIdList
);
// 返回的用户id
List
<
Long
>
userIdList
=
new
ArrayList
<>();
if
(
userList
.
size
()
>
0
)
{
for
(
SysUser
user:
userList
)
{
userIdList
.
add
(
user
.
getSysUserId
());
}
//
4
.删除当前商户用户子用户信息
//
5
.删除当前商户用户子用户信息
sysUserAuthService
.
remove
(
SysUserAuth
.
gw
().
in
(
SysUserAuth:
:
getUserId
,
userIdList
));
}
//
5
.删除当前商户的登录用户
//
6
.删除当前商户的登录用户
sysUserService
.
remove
(
SysUser
.
gw
()
.
eq
(
SysUser:
:
getBelongInfoId
,
mchNo
)
.
eq
(
SysUser:
:
getSysType
,
CS
.
SYS_TYPE
.
MCH
)
);
//
6
.删除当前商户
//
7
.删除当前商户
boolean
removeMchInfo
=
removeById
(
mchNo
);
if
(!
removeMchInfo
)
throw
new
BizException
(
"删除当前商户失败"
);
return
userIdList
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录