Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

puhanshu

2022-08-16 a6dadc1633f8c0b19c8b033f4c560b70211fb67d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.SysUserMapper;
import com.panzhihua.service_community.entity.ComBatteryStore;
import com.panzhihua.service_community.dao.ComBatteryStoreMapper;
@@ -68,6 +69,7 @@
        if (this.baseMapper.insert(entity) > 0) {
            //新增电动车商城商家账号
            SysUser sysUser = new SysUser();
            sysUser.setUserId(Snowflake.getId());
            sysUser.setType(20);
            sysUser.setStatus(SysUser.Status.YES);
            sysUser.setAccount(comBatteryStore.getAccount());
@@ -77,6 +79,7 @@
            sysUser.setName(comBatteryStore.getName() + "管理员");
            sysUser.setPlaintextPassword(comBatteryStore.getPassword());
            sysUser.setCommunityId(entity.getId());
            sysUser.setAppId("wx0cef797390444b75");
            userDao.insert(sysUser);
            return R.ok();
        }
@@ -98,6 +101,8 @@
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        //注册手机不可修改
        entity.setRegPhone(null);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }