lisang
/
jeepay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增商户添加默认应用

This commit is contained in:
zhuxiao 2021-06-18 10:37:34 +08:00
parent 7b06548040
commit 7482fc5c0b
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java
View File

@ -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;
/**

2
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java
View File

@ -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);

2
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
View File

@ -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) {

32
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java
View File

@ -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;