20221221

xiaoyong931011

2022-12-22 41189702c2bbae889e997ae4c1e1d55eee59eadf

20221221

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -66,18 +66,18 @@
    public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
        Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
//        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
//        if(CollUtil.isNotEmpty(records)){
//            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
//                Long id = adminMallOrderInfoVo.getId();
//                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
//                StringBuffer stringBuffer = new StringBuffer();
//                for(MallOrderItem mallOrderItem : mallOrderItemList){
//                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
//                }
//                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
//            }
//        }
        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
                Long id = adminMallOrderInfoVo.getId();
                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
                StringBuffer stringBuffer = new StringBuffer();
                for(MallOrderItem mallOrderItem : mallOrderItemList){
                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
                }
                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
            }
        }
        return adminMallOrderInfoVos;
    }


 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -73,7 +73,7 @@
    public FebsResponse register(RegisterDto registerDto) {
        MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
        if (mallMember != null) {
            throw new FebsException("该账号已被占用");
            throw new FebsException("001-该账号已被占用");
        }

        List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -158,7 +158,7 @@
                sku.setSkuVolume(sku.getSkuVolume() + 1);
                mallGoodsSkuMapper.updateById(sku);

                if (addOrderDto.getType() == 1) {
                if (1 == addOrderDto.getType() ) {
                    mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
                }
                mallOrderItemMapper.insert(orderItem);