jiaosong
2023-10-19 54abb5ddf28802b9a89061e921472e71e5e974cc
#路径拼接
已修改6个文件
30 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/resources/application-dev.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/resources/mappers/SystemUserMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -106,10 +106,15 @@
    @Override
    @Transactional
    public void create(CreateSystemUserDTO systemUser) {
        if (StringUtils.isBlank(systemUser.getMobile()) || systemUser.getMobile().length() < 6){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"创建用户参数错误");
        }
        // 验证用户名
        SystemUser queryUserDto = new SystemUser();
        queryUserDto.setUsername(systemUser.getUsername());
        queryUserDto.setDeleted(Constants.ZERO);
        queryUserDto.setUsername(systemUser.getMobile());
        SystemUser user = systemUserService.findOne(queryUserDto);
        if (user != null) {
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "用户名已存在");
@@ -128,9 +133,10 @@
        // 生成密码盐
        String salt = RandomStringUtils.randomAlphabetic(6);
        // 生成密码
        systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
        systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getMobile().substring(systemUser.getMobile().length() - 6), salt));
        systemUser.setSalt(salt);
        systemUser.setId(UUID.randomUUID().toString());
        systemUser.setUsername(systemUser.getMobile());
        // 创建用户记录
        systemUserService.create(systemUser);
        // 设置部门
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
/**
 * 广告信息表Service实现
@@ -66,11 +67,11 @@
                .eq(Ad::getId,ad.getId())
                .set(Ad::getEditor,ad.getEditor())
                .set(Ad::getEditDate,ad.getEditDate())
                .set(Ad::getName,ad.getName())
                .set(Ad::getImgurl,ad.getImgurl())
                .set(Objects.nonNull(ad.getName()),Ad::getName,ad.getName())
                .set(Objects.nonNull(ad.getImgurl()),Ad::getImgurl,ad.getImgurl())
                .set(Ad::getSortnum,ad.getSortnum())
                .set(Ad::getContent,ad.getContent())
                .set(Ad::getStatus,ad.getStatus());
                .set(Objects.nonNull(ad.getContent()),Ad::getContent,ad.getContent())
                .set(Objects.nonNull(ad.getStatus()),Ad::getStatus,ad.getStatus());
        adMapper.update(null,wrapper);
    }
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -524,7 +524,7 @@
            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(orderId);
            refundDTO.setCanBalance(canBalance);
            refundDTO.setRefundAmount(money);
            refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setCreator(principal.getId());
server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -144,8 +144,8 @@
            user.setRoles(systemRoleService.findByUserId(user.getId()));
            // 查询用户岗位列表
            user.setPositions(systemPositionService.findByUserId(user.getId()));
            String imgPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.FILES_DIR,Constants.AVATAR_FILE).getCode();
            user.setAvatar(Constants.formatImgPath(user.getAvatar(),imgPath));
//            String imgPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.FILES_DIR,Constants.AVATAR_FILE).getCode();
            user.setAvatar(Constants.formatImgPath(user.getAvatar(),""));
        }
        return PageData.from(new PageInfo<>(userList));
    }
server/services/src/main/resources/application-dev.yml
@@ -50,8 +50,8 @@
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
#    notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
    notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
#    keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
    keyPath: /usr/local/apiclient_cert.p12
    keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
#    keyPath: /usr/local/apiclient_cert.p12
########################mqtt相关配置########################
mqtt:
  host: tcp://175.27.187.84:1883
server/services/src/main/resources/mappers/SystemUserMapper.xml
@@ -63,7 +63,7 @@
    select
    distinct
    usr.id, usr.birthday, usr.email, usr.emp_no, usr.mobile, usr.avatar, usr.username, usr.realname, usr.sex, usr.fixed, usr.create_time, usr.update_time,
    usr.admin_type,usr.user_type,usr.nickname,usr.accepted_number,usr.total_integral,usr.type,
    usr.nickname,
    create_user.id create_user_id, create_user.username create_user_name,
    update_user.id updete_user_id, update_user.username update_user_name
    from "system_user" usr
@@ -82,7 +82,6 @@
      </if>
    </where>
    order by usr.accepted_number desc
  </select>