zxl
4 天以前 98f55ebbcce815983853bf2d96485a306c5cb051
订单列表问题
4个文件已修改
20 ■■■■■ 已修改文件
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -829,7 +829,10 @@
    public MemberVO getMember(String id) {
        MemberVO member = baseMapper.getVoById(id);
        if (Objects.nonNull(member)) {
            member.setFace(cosUtil.getPreviewUrl(member.getFace()));
            if(StringUtils.isNotBlank(member.getFace()) && !member.getFace().contains("https")){
                member.setFace(cosUtil.getPreviewUrl(member.getFace()));
            }
        }
        return member;
    }
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -86,6 +86,7 @@
            "o.consignee_name AS consigneeName," +
            "o.consignee_mobile AS consigneeMobile," +
            "o.member_id AS memberId," +
            "m.nick_name AS nickName," +
            " GROUP_CONCAT(oi.goods_id) as group_goods_id," +
            " GROUP_CONCAT(oi.sku_id) as group_sku_id," +
            " GROUP_CONCAT(oi.num) as group_num" +
@@ -99,6 +100,7 @@
            ",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
            ",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
            " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn " +
            "LEFT JOIN li_member m on m.id = o.member_id " +
            "${ew.customSqlSegment}")
    IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -265,12 +265,12 @@
            }
        }
        for (OrderSimpleVO vo : page.getRecords()){
            Member member = memberMapperMapper.selectById(vo.getMemberId());
            if (member != null){
                vo.setNickName(member.getNickName());
            }
        }
//        for (OrderSimpleVO vo : page.getRecords()){
//            Member member = memberMapperMapper.selectById(vo.getMemberId());
//            if (member != null){
//                vo.setNickName(member.getNickName());
//            }
//        }
        return page;
    }
manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
@@ -47,7 +47,6 @@
    @ApiImplicitParam(name = "id", value = "会员ID", required = true, dataType = "String", paramType = "path")
    @GetMapping(value = "/{id}")
    public ResultMessage<MemberVO> get(@PathVariable String id) {
        return ResultUtil.data(memberService.getMember(id));
    }