bug修改

xuhy

2025-08-26 f221182c97f52bc7121b042b7ab16bf13813f851

bug修改

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java

@@ -104,6 +104,11 @@
            public R delSysUserById(Long userId) {
                return R.fail("根据id删除管理员账户失败：" + cause.getMessage());
            }

            @Override
            public R<SysUser> queryUserBySiteId(Integer siteId) {
                return R.fail("根据站点id查询账户失败：" + cause.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java

@@ -6,10 +6,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -131,4 +128,13 @@
     */
    @PostMapping("/user/delSysUserById")
    R delSysUserById(@RequestParam("userId") Long userId);

    /**
     * 通过站点id查询用户
     * @param siteId
     * @return
     */
    @GetMapping("/user/queryUserBySiteId")
    R<SysUser>  queryUserBySiteId(@RequestParam("siteId")Integer siteId);

}

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -62,7 +62,8 @@
            String status = otherClient.getServiceStatus(data.getUserId().intValue()).getData();
            switch (status){
                case "1":
                    return R.fail("未缴纳服务费");
//                    return R.fail("未缴纳服务费");
                    break;
                case "2":
                    return R.fail("服务费已过期");
            }
@@ -98,7 +99,8 @@
            String status = otherClient.getServiceStatus(data.getUserId().intValue()).getData();
            switch (status){
                case "1":
                    return R.fail("未缴纳服务费");
//                    return R.fail("未缴纳服务费");
                    break;
                case "2":
                    return R.fail("服务费已过期");
            }

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -726,4 +726,9 @@
        userService.deleteUserById(userId);
        return R.ok();
    }
    @GetMapping("/queryUserBySiteId")
    public R queryUserBySiteId(@RequestParam("siteId") Integer siteId){
        SysUser user = userService.selectUserBySiteId(siteId);
        return R.ok(user);
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -153,4 +153,7 @@
     * @return
     */
    List<SysUser> getChangeUserList(@Param("pageInfo")PageInfo<SysUser> pageInfo,@Param("query") ChangeUserQuery query);

    SysUser selectUserBySiteId(@Param("siteId")Integer siteId);

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -229,4 +229,6 @@
     * @return
     */
    PageInfo<SysUser> getChangeUserList(ChangeUserQuery query);

    SysUser selectUserBySiteId(Integer siteId);
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -599,5 +599,10 @@
        List<SysUser> list = this.baseMapper.getChangeUserList(pageInfo, query);
        return pageInfo.setRecords(list);
    }
	

    @Override
    public SysUser selectUserBySiteId(Integer siteId) {
        return this.baseMapper.selectUserBySiteId(siteId);
    }

}

 ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml

@@ -203,8 +203,11 @@
        select user_id, user_name from sys_user where nick_name = #{nickName}
        and del_flag = '0' limit 1
    </select>
    <select id="selectUserBySiteId" resultType="com.ruoyi.system.api.domain.SysUser">
        select * from sys_user where del_flag = '0' and status = '0' and site_id = #{siteId}
    </select>

    <insert id="insertUser" parameterType="com.ruoyi.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
    <insert id="insertUser" parameterType="com.ruoyi.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
             <if test="userId != null and userId != 0">user_id,</if>
             <if test="deptId != null and deptId != 0">dept_id,</if>

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -571,7 +571,7 @@
        if (result == null || result.get("total_points") == null) {
            userStatistics.setTotalScore(0L);
        }else {
            userStatistics.setTotalScore(((BigDecimal) result.get("total_points")).longValue());
            userStatistics.setTotalScore(Long.valueOf(result.get("total_points").toString()));
        }
        //条件构造  消费积分现金支付金额
        queryWrapper.clear();

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -333,8 +333,8 @@
    @PostMapping("/editSite")
    @ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
    @Log(title = "【站点管理】编辑站点", businessType = BusinessType.UPDATE)
    public AjaxResult editSite(@RequestBody Site site){
        return siteService.editSite(site);
    public AjaxResult editSite(@RequestBody SiteDTO dto){
        return siteService.editSite(dto);
    }
    
    @ResponseBody

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -18,6 +18,8 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.domain.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -47,14 +49,16 @@

    private final TChargingPileService chargingPileService;
    private final TChargingGunService chargingGunService;
	
    private final TokenService tokenService;

    @Resource
    private RedisTemplate redisTemplate;

    @Autowired
    public TChargingPileController(TChargingPileService chargingPileService, TChargingGunService chargingGunService) {
    public TChargingPileController(TChargingPileService chargingPileService, TChargingGunService chargingGunService, TokenService tokenService) {
        this.chargingPileService = chargingPileService;
        this.chargingGunService = chargingGunService;
        this.tokenService = tokenService;
    }

    /**
@@ -103,7 +107,9 @@
    @GetMapping("/pageChargingPileList")
    @ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
    public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(PageChargingPileList page){
        PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
        SysUser sysUser = tokenService.getLoginUser().getSysUser();
        Integer siteId = sysUser.getSiteId();
        PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page,siteId);
        return AjaxResult.success(list);
    }
    

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java

@@ -48,7 +48,7 @@
     * @param site
     * @return
     */
    AjaxResult editSite(Site site);
    AjaxResult editSite(SiteDTO dto);
    
    
    /**

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java

@@ -27,7 +27,7 @@
     * @param page
     * @return
     */
    PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page);
    PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page,Integer siteId);
    
    
    /**

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -32,6 +32,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Set;

/**
@@ -98,6 +99,10 @@
        if(ajaxResult.isError()){
            return ajaxResult;
        }
        SysUser sysUser = sysUserClient.queryUserByUserName(dto.getAccount()).getData();
        if (Objects.nonNull(sysUser)){
            return AjaxResult.error("账号已存在");
        }
        Site one = this.getOne(new LambdaQueryWrapper<Site>().eq(Site::getCode, dto.getCode()).eq(Site::getDelFlag, 0));
        if(null != one){
            return AjaxResult.error("站点编号重复");
@@ -125,20 +130,52 @@
    
    /**
     * 编辑站点
     * @param site
     * @param dto
     * @return
     */
    @Override
    public AjaxResult editSite(Site site) {
        AjaxResult ajaxResult = addSiteVerify(site);
    public AjaxResult editSite(SiteDTO dto) {
        AjaxResult ajaxResult = addSiteVerify(dto);
        if(ajaxResult.isError()){
            return ajaxResult;
        }
        Site one = this.getOne(new LambdaQueryWrapper<Site>().eq(Site::getCode, site.getCode()).eq(Site::getDelFlag, 0));
        if(null != one && !one.getCode().equals(site.getCode())){
        Site one = this.getOne(new LambdaQueryWrapper<Site>().eq(Site::getCode, dto.getCode()).eq(Site::getDelFlag, 0));
        if(null != one && !one.getCode().equals(dto.getCode())){
            return AjaxResult.error("站点编号重复");
        }
        this.updateById(site);

        // 通过站点id查询登录账号
        SysUser sysUser = sysUserClient.queryUserBySiteId(dto.getId()).getData();
        // 判断是否更换了账号  更换了账号判断是否已存在
        if(null != sysUser && !sysUser.getUserName().equals(dto.getAccount())){
            SysUser sysUser1 = sysUserClient.queryUserByUserName(dto.getAccount()).getData();
            if(null != sysUser1){
                return AjaxResult.error("账号已存在");
            }
            // 添加登录账号
            SysUser user = new SysUser();
            user.setPhonenumber(dto.getAccount());
            user.setUserName(dto.getAccount());
            user.setNickName(dto.getName());
            user.setPassword(dto.getPassword());
            user.setStatus("0");
            user.setDelFlag("0");
            user.setRoleId(2L);
            user.setSiteId(dto.getId());
            R<Long> r = sysUserClient.addSysUserSite(user);
            if(200 != r.getCode()){
                throw new RuntimeException(r.getMsg());
            }
            dto.setUserId(r.getData());
            // 删除原有的登录账号
            R res = sysUserClient.delSysUserById(sysUser.getUserId());
        }
        if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount())) {
            // 修改密码
            R res = sysUserClient.resetPassword(sysUser);
        }

        this.updateById(dto);
        return AjaxResult.success();
    }
    

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -48,8 +48,10 @@
     * @return
     */
    @Override
    public PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page) {
        Set<Integer> siteIds = null;
    public PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page,Integer siteId) {
        // 获取当前登录账号站点
        Set<Integer> siteIds = new HashSet<>();
        siteIds.add(siteId);
        PageInfo<PageChargingPileListDTO> pageInfo = new PageInfo<>(page.getPageCurr(), page.getPageSize());
        List<PageChargingPileListDTO> list = this.baseMapper.pageChargingPileList(pageInfo, page, siteIds);
        return pageInfo.setRecords(list);

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java

@@ -314,7 +314,7 @@
            throw new ServiceException(e.getMessage());
        }
        if(!result.isEmpty()){
            return R.fail(result);
            return R.fail(result.toString());
        }
        return R.ok();
    }

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -170,22 +170,21 @@
            og.goods_id,
            og.selling_price,
            og.good_json,
        o.pay_method,
            o.pay_method,
            o.payment_amount orderMoney,
            o.point ,
            o.serial_number,
        o.shop_id as shopId
            o.shop_id as shopId

        FROM
            t_order_good og
                LEFT JOIN t_order o ON og.order_id = o.id
        left join
        t_order_good og
            LEFT JOIN t_order o ON og.order_id = o.id
        where  o.del_flag = 0 and o.pay_status = 2
        <if test="null != item.orderNumber and '' != item.orderNumber">
            and o.order_number like CONCAT('%', #{item.orderNumber}, '%')
        </if>
        <if test="null != item.goodName and '' != item.goodName">
            and good_name like CONCAT('%', #{item.goodName}, '%')
            and og.good_name like CONCAT('%', #{item.goodName}, '%')
        </if>

        <if test="null != item.appUserIds and item.appUserIds.size() > 0">
@@ -204,7 +203,7 @@
            and o.order_status in (4, 8)
        </if>
        <if test="null != item.shopIds and item.shopIds.size() > 0">
            and shop_id in
            and o.shop_id in
            <foreach collection="item.shopIds" separator="," item="tem" index="index" open="(" close=")">
                #{tem}
            </foreach>

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java

@@ -78,9 +78,8 @@
    // 查询服务费缴纳情况
    @GetMapping("/getServiceStatus/{userId}")
    public R<String> getServiceStatus(@PathVariable("userId") Integer userId) {
        Long userid = tokenService.getLoginUser().getUserid();
        ServicePay servicePayBefore = servicePayService.lambdaQuery()
                .eq(ServicePay::getUserId, userid)
                .eq(ServicePay::getUserId, userId)
                .eq(ServicePay::getPayStatus,2)
                .eq(ServicePay::getDelFlag,0)
                .orderByDesc(ServicePay::getCreateTime)