puzhibing
昨天 ba09471e52a73e85971ac857bd9f160b1bfdc494
修改bug
3个文件已修改
10 ■■■■ 已修改文件
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderGoodsMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
@@ -69,6 +70,9 @@
    @ApiOperation(value = "获取购物车列表")
    public R<List<AppShoppingCartVo>> listShoppingCart() {
        Long userId = SecurityUtils.getUserId();
        if(null == userId){
            return R.ok(new ArrayList<>());
        }
        Member member = memberService.getMember(userId).getData();
        Long shopId = member.getRelationShopId();
        List<AppShoppingCartVo> appShoppingCartVoList = shoppingCartService.listShoppingCartVo(userId, shopId);
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
@@ -146,7 +146,7 @@
        t_order o ON og.order_id = o.order_id
        WHERE
        og.goods_id IN
        <foreach collection="goodsIdList" item="goodsId" open="(" separator="," close=")">
        <foreach collection="goodsIds" item="goodsId" open="(" separator="," close=")">
            #{goodsId}
        </foreach>
        AND o.del_flag = 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -368,8 +368,8 @@
    @RequestMapping(value = "/pageClassification", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取分类列表")
    public R<Page<MgtClassificationPageVo>> pageClassification(@RequestBody MgtClassificationPageDto mgtClassificationPageDto) {
        Long userId = SecurityUtils.getUserId();
        mgtClassificationPageDto.setUserId(userId);
//        Long userId = SecurityUtils.getUserId();
//        mgtClassificationPageDto.setUserId(userId);
        Page<MgtClassificationPageVo> page = new Page<>();
        page.setSize(mgtClassificationPageDto.getPageSize());
        page.setCurrent(mgtClassificationPageDto.getPageNum());