bug修改

无关风月

2024-07-03 1ab3022a08c32087cbc131fd00e25affacbb5eff

bug修改

 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TGoods.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BaseModel;
import com.sun.xml.internal.ws.developer.Serialization;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -94,7 +95,6 @@
     * 商品详情
     */
    @ApiModelProperty(value = "商品详情")
    @JsonFormat()
    private String detail;

    /**

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java

@@ -90,8 +90,12 @@
        if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
            StringBuilder temp = new StringBuilder("");
            for (String s : goodQuery.getType()) {
                wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
                temp.append(s);
                temp.append(",");
            }
            String string = temp.toString();
            String substring = string.substring(0, string.length() - 1);
            wrapper.eq("typeIds",substring);
        }
        wrapper.eq("isDelete", 0);
        return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
@@ -109,10 +113,14 @@
        wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
        // 类型匹配 todo
        if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
            StringBuilder temp = new StringBuilder("");
            for (String s : goodQuery.getType()) {
                // 将每个类型 ID 应用于 FIND_IN_SET 函数
                wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
                temp.append(s);
                temp.append(",");
            }
            String string = temp.toString();
            String substring = string.substring(0, string.length() - 1);
            wrapper.eq("typeIds",substring);
        }
        wrapper.eq("isDelete", 0);
        wrapper.orderByAsc("sort");
@@ -210,12 +218,22 @@
    @PostMapping("/updateGoods")
    @ApiOperation(value = "修改", tags = {"后台-商品管理"})
    public R updateGoods(@RequestBody TGoods dto) {
        if (dto.getTotal() != null) {
            dto.setSurplus(dto.getTotal());
        } else {
            dto.setSurplus(0);
        TGoods byId = goodsService.getById(dto.getId());
        if (!Objects.equals(byId.getTotal(), dto.getTotal())){
            // 如果修改了商品总数 那么需要再判断当前商品已被购买了多少
            List<TOrder> list = orderService.list(new QueryWrapper<TOrder>()
                    .eq("goodsId", dto.getId()));
            Integer temp = 0;
            for (TOrder tOrder : list) {
                temp += tOrder.getCount();
            }
            if (dto.getTotal()<temp){
                return R.fail("商品总数不能小于当前商品已兑换数量,"+"当前商品已兑换数量为:"+temp);
            }
        }
        goodsService.updateById(dto);
        goodsService.updateOne(dto);

        return R.ok("修改成功");
    }


 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TGoodsMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.TGoods;
import com.ruoyi.goods.vo.TGoodsVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -25,4 +26,6 @@
     */
    List<TGoodsVO> goodRecommend(Integer userId);

    void updateOne(@Param("req") TGoods dto);

}

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java

@@ -47,4 +47,7 @@
     */
    R<String> goodExchange(GoodExchangeDTO goodExchange, Recipient recipient);
    R goodExchange1(GoodExchangeDTO goodExchange, Recipient recipient);

    void updateOne(TGoods dto);

}

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java

@@ -334,6 +334,11 @@
        return R.ok();
    }

    @Override
    public void updateOne(TGoods dto) {
        this.baseMapper.updateOne(dto);
    }

    private TOrder orderInfo(GoodExchangeDTO goodExchange, Recipient recipient, Integer number, Integer goodId, int needIntegral) {
        TOrder order = new TOrder();
        order.setOrderNumber(goodExchange.getOrderNumber());

 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml

@@ -34,6 +34,17 @@
        type,
        integral
    </sql>
    <update id="updateOne">
        update t_goods
        <set>
                price = #{req.price},
                total = #{req.total},
                userCount = #{req.userCount},
                basicCount = #{req.basicCount},
                userCount = #{req.userCount},
        </set>
        and id = #{req.id}
    </update>

    <select id="goodRecommend" resultType="com.ruoyi.goods.vo.TGoodsVO">
        select *

 ruoyi-service/ruoyi-management/pom.xml

@@ -18,9 +18,7 @@
        <dependency>
            <groupId>com.huawei.apigateway</groupId>
            <artifactId>java-sdk-core</artifactId>
            <version>3.2.5</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
            <version>3.2.4</version>
        </dependency>
        <dependency>
            <groupId>com.huaweicloud</groupId>

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java

@@ -133,13 +133,13 @@
            @ApiImplicitParam(value = "id", name = "id", required = true),
            @ApiImplicitParam(value = "状态 1上架2下架3删除", name = "state", required = true),
    })
    public AjaxResult updateState(Integer id, Integer state) {
    public R updateState(Integer id, Integer state) {
        R update = studyClient.updateState(id,state);
        int code = update.getCode();
        if (code == 500){
            return AjaxResult.error(update.getMsg());
        if (code == 602){
            return R.failUpdate(update.getMsg());
        }
        return AjaxResult.success("修改成功");
        return R.ok("修改成功");
    }
    @ApiOperation(value = "添加", tags = {"后台-故事管理"})
    @PostMapping(value = "/addStory")
@@ -151,13 +151,14 @@
    @ApiOperation(value = "修改", tags = {"后台-故事管理"})
    @PostMapping(value = "/updateStory")
    @ResponseBody
    public AjaxResult updateStory(StoryDTO dto) {
    public R updateStory(StoryDTO dto) {
        R update = studyClient.update(dto);
        int code = update.getCode();
        if (code == 500){
            return AjaxResult.error(update.getMsg());
        if (code == 602){
            return R.failUpdate(update.getMsg());
        }
        return AjaxResult.success("添加成功");

        return R.ok("添加成功");
    }
    @ApiOperation(value = "查看详情", tags = {"后台-故事管理"})
    @PostMapping(value = "/getStoryInfo")
@@ -174,13 +175,13 @@
            @ApiImplicitParam(value = "id", name = "id", required = true),
            @ApiImplicitParam(value = "状态 1上架2下架3删除", name = "state", required = true),
    })
    public AjaxResult updateState1(Integer id, Integer state) {
    public R updateState1(Integer id, Integer state) {
        R update = studyClient.updateState1(id,state);
        int code = update.getCode();
        if (code == 500){
            return AjaxResult.error(update.getMsg());
        if (code == 602){
            return R.failUpdate(update.getMsg());
        }
        return AjaxResult.success("修改成功");
        return R.ok("修改成功");
    }
}


 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java

@@ -151,7 +151,7 @@

    @PostMapping("/agreement")
    @ApiOperation(value = "协议", tags = {"后台-协议管理"})
    public AjaxResult agreement(AggrementDTO dto) {
    public AjaxResult agreement(@RequestBody AggrementDTO dto) {
        TProtocol protocol = protocolService.getById(dto.getType());
        if (StringUtils.hasLength(dto.getContent())){
            protocol.setContent(dto.getContent());
@@ -211,7 +211,7 @@

    @PostMapping("/updateUseGuide")
    @ApiOperation(value = "使用指南-添加/编辑/查看详情", tags = {"使用指南"})
    public AjaxResult<TUseGuide> updateUseGuide(UseGuidDTO dto) {
    public AjaxResult<TUseGuide> updateUseGuide(@RequestBody UseGuidDTO dto) {
        switch (dto.getType()) {
            case 1:
                TUseGuide useGuide = new TUseGuide();

 ruoyi-service/ruoyi-study/pom.xml

@@ -15,18 +15,8 @@
    </description>

    <dependencies>
        <dependency>
            <groupId>com.huawei.apigateway</groupId>
            <artifactId>java-sdk-core</artifactId>
            <version>3.2.5</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>com.huaweicloud</groupId>
            <artifactId>esdk-obs-java-bundle</artifactId>
            <version>3.23.9</version>
        </dependency>



        <dependency>
            <groupId>redis.clients</groupId>
@@ -34,6 +24,11 @@
            <version>2.9.0</version>
        </dependency>
        <dependency>
            <groupId>com.huawei.apigateway</groupId>
            <artifactId>java-sdk-core</artifactId>
            <version>3.2.4</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -175,7 +175,7 @@
        try {
            System.err.println("进入支付宝回调");
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            System.err.println("返回参数");
            System.err.println("返回参数"+map);
            if (null != map) {
                String out_trade_no = map.get("out_trade_no");
                String trade_no = map.get("trade_no");
@@ -476,12 +476,14 @@
                    } else {
                        tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                        tUser1 = getUser(phone);
                        tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
                        userService.save(tUser1);
                    }
                }
            } else {
                tUser1 = getUser(phone);
                tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
                userService.save(tUser1);
            }
        }
@@ -553,7 +555,7 @@
        } else {
            user = getUser(phone);
            user.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");

            user.setAccount("用户"+UUIDUtil.getNumberRandom(6));
            userService.save(user);
        }
        // 生成登录用户信息
@@ -738,6 +740,18 @@
            return R.tokenError("登录失效！");
        }
        TUser byId = userService.getById(loginUserStudy.getUserid());
        // 判断用户会员到期时间 用于判断这个用户到底是不是会员
        if (null != byId.getVipEndTime()) {
            Date vipEndTime = byId.getVipEndTime();
            Date now = new Date();
            if (vipEndTime.before(now)) {
                byId.setIsVip(Constants.ZERO);
            } else {
                byId.setIsVip(Constants.ONE);
            }
        }else{
            byId.setIsVip(Constants.ZERO);
        }
        return R.ok(byId);
    }