diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java index 358c25f0286a7ae9e745ba66cc421e2b984daa03..02fb43e2bb246e0aacf70532af21507843ba7318 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchApp.java @@ -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; /** diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java index 51865a105dc18323360fbb4921ae8bd195263177..8058bb479b59c635fc7fcc0e5525306b8fbd0ac6 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java @@ -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); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java index c655660978a89384827f95a534da636182b907c0..0e7db5889a329f8dcc29e504c14208ee3ad4cf66 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java @@ -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) { diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java index 0c1345ef5e212d3b1ead37302afb96421997e617..1b330fa6fcfeb0c9fe8f42d90838185ad1d3a44e 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java @@ -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 { 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 { .eq(SysUser::getBelongInfoId, mchNo) .eq(SysUser::getSysType, CS.SYS_TYPE.MCH) ); + + // 4.删除当前商户应用信息 + mchAppService.removeByIds(appIdList); + // 返回的用户id List 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;