绿满筐商城java服务
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
peng
5 天以前 a749712eeb682285a402b563f26f7b916015b6dc 
 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java


@@ -5,7 +5,6 @@


import cn.hutool.core.date.DateUtil;


import cn.hutool.core.io.IoUtil;


import cn.hutool.core.text.CharSequenceUtil;


import cn.hutool.core.util.ArrayUtil;


import cn.hutool.core.util.StrUtil;


import cn.hutool.json.JSONUtil;


import cn.hutool.poi.excel.ExcelReader;


@@ -17,6 +16,7 @@


import cn.lili.common.event.TransactionCommitSendMQEvent;


import cn.lili.common.exception.ServiceException;


import cn.lili.common.properties.RocketmqCustomProperties;


import cn.lili.common.security.AuthUser;


import cn.lili.common.security.OperationalJudgment;


import cn.lili.common.security.context.UserContext;


import cn.lili.common.security.enums.UserEnums;


@@ -26,6 +26,7 @@


import cn.lili.modules.goods.entity.dos.Goods;


import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;


import cn.lili.modules.goods.service.GoodsService;


import cn.lili.modules.lmk.enums.general.AdminRoleEnum;


import cn.lili.modules.member.entity.dto.MemberAddressDTO;


import cn.lili.modules.order.cart.entity.dto.TradeDTO;


import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;


@@ -39,6 +40,9 @@


import cn.lili.modules.order.trade.entity.dos.OrderLog;


import cn.lili.modules.order.trade.service.OrderLogService;


import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;


import cn.lili.modules.permission.entity.dos.AdminUser;


import cn.lili.modules.permission.service.AdminUserService;


import cn.lili.modules.permission.service.RoleService;


import cn.lili.modules.promotion.entity.dos.Pintuan;


import cn.lili.modules.promotion.service.PintuanService;


import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;


@@ -62,6 +66,7 @@


import cn.lili.trigger.model.TimeTriggerMsg;


import cn.lili.trigger.util.DelayQueueTools;


import cn.lili.utils.COSUtil;


import cn.lili.utils.CommonUtil;


import com.baomidou.mybatisplus.core.conditions.Wrapper;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


@@ -89,7 +94,7 @@


import java.net.URLEncoder;


import java.util.*;


import java.util.stream.Collectors;




import cn.lili.modules.permission.entity.dos.Role;


/**


 * 子订单业务层实现


 *


@@ -176,6 +181,10 @@


    private GoodsService goodsService;


    @Autowired


    private COSUtil cosUtil;


    @Autowired


    private AdminUserService adminUserService;






    @Override


    @Transactional(rollbackFor = Exception.class)


    public void intoDB(TradeDTO tradeDTO) {


@@ -205,6 +214,12 @@


                    UserContext.getCurrentUser().getUsername(), message));


            item.getCheckedSkuList().forEach(


                    sku -> {


//                        OrderItem e = new OrderItem(sku, item, tradeDTO);


//                        String goodsId = e.getGoodsId();


//                        Goods goods = goodsService.getById(goodsId);


//                        item.getPriceDetailDTO().setPlatFormCommissionPoint(Double.valueOf(goods.getCommission().toString()));


//                        e.setPriceDetailDTO(item.getPriceDetailDTO());


//                        orderItems.add(e);


                        orderItems.add(new OrderItem(sku, item, tradeDTO));


                        currentOrderItems.add(new OrderItem(sku, item, tradeDTO));


                    }


@@ -228,15 +243,61 @@


        QueryWrapper queryWrapper = orderSearchParams.queryWrapper();


        queryWrapper.groupBy("o.id");


        queryWrapper.orderByDesc("o.id");


        return this.baseMapper.queryByParams(PageUtil.initPage(orderSearchParams), queryWrapper);


        IPage<OrderSimpleVO> page =  this.baseMapper.queryByParams(PageUtil.initPage(orderSearchParams), queryWrapper);




        if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){


            for (OrderSimpleVO vo : page.getRecords()){


                vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));


                vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));


            }


        }


        return page;


    }








    @Override


    public IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchParams orderSearchParams) {


    public IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams) {


        QueryWrapper queryWrapper = orderSearchParams.queryWrapper();


        queryWrapper.groupBy("o.id");


        queryWrapper.orderByDesc("o.id");


        IPage<OrderSimpleXcxVO>  iPage = this.baseMapper.queryByXcxParams(PageUtil.initPage(orderSearchParams), queryWrapper);


        Set<String> goodsIds = new HashSet<>();


        for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) {


            orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems());


            String groupGoodsId = orderSimpleVO.getGroupGoodsId();


            if (StringUtils.isNotBlank(groupGoodsId)) {


                goodsIds.addAll(Arrays.asList(groupGoodsId.split(",")));


            }


        }


        if (CollectionUtil.isNotEmpty(goodsIds)) {


            List<Goods> list = goodsService.list(Wrappers.<Goods>lambdaQuery().in(Goods::getId, goodsIds));


            Map<String, String> goodsVideos = list


                    .stream().collect(Collectors.toMap(Goods::getId, g->


                            StringUtils.isNotBlank(g.getGoodsVideo())?g.getGoodsVideo():""


                    ));


            iPage.getRecords().forEach(orderSimpleVO -> {


                orderSimpleVO.getOrderItems().forEach(orderItem -> {


                    String videoUrl = goodsVideos.get(orderItem.getGoodsId());


                    if (StringUtils.isNotBlank(videoUrl)&&!videoUrl.contains("http")) {


                        orderItem.setVideo(cosUtil.getPreviewUrl(videoUrl));


                    }


                    String image = orderItem.getImage();


                    if (StringUtils.isNotBlank(image)&&!image.contains("http")) {


                        orderItem.setImage(cosUtil.getPreviewUrl(image));


                    }


                });


            });


        }


        return iPage;


    }




    @Override


    public IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams) {


        QueryWrapper queryWrapper = orderSearchParams.queryWrapper();


        queryWrapper.groupBy("o.id");


        queryWrapper.orderByDesc("o.id");


        IPage<OrderSimpleXcxVO>  iPage = this.baseMapper.querySupplierOrderParams(PageUtil.initPage(orderSearchParams), queryWrapper);


        Set<String> goodsIds = new HashSet<>();


        for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) {


            orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems());


@@ -335,8 +396,17 @@




    @Override


    public void queryExportOrder(HttpServletResponse response, OrderSearchParams orderSearchParams) {


        List<OrderExportDTO> orderExportDTOS = this.baseMapper.queryExportOrder(orderSearchParams.queryWrapper());




        XSSFWorkbook workbook = initOrderExportData(this.baseMapper.queryExportOrder(orderSearchParams.queryWrapper()));


        if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){


            for (OrderExportDTO vo : orderExportDTOS){


                vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));


                vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));


            }


        }






        XSSFWorkbook workbook = initOrderExportData(orderExportDTOS);


        try {


            // 设置响应头


            String fileName = URLEncoder.encode("订单列表", "UTF-8");


@@ -454,7 +524,25 @@




        //记录店铺订单支付流水


        storeFlowService.payOrder(orderSn);




        //todo 生成订单记录表


//        //获取子订单数据


//        List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);


//        List<String> goodsIds = orderItems.stream().map(OrderItem::getGoodsId).distinct().collect(Collectors.toList());


//


//        Map<String, OrderItem> orderItem = orderItems.stream()


//                .collect(Collectors.toMap(OrderItem::getGoodsId, Function.identity()


//                        ,(oldValue, newValue) -> oldValue));


//        //根据订单item项创建抽成流水订单


//        List<CommissionRecord> commissionRecords = new ArrayList<>();


//        CommissionRecord commissionRecord;


//        for (OrderItem item : orderItems) {


//            commissionRecord = new CommissionRecord();


//            commissionRecord.setSn(item.getSn());


//            BigDecimal commission = item.getCommission();


//            commissionRecord.setCommission(commission);


//            commissionRecord.setCommissionPrice();


//


//        }


        //发送订单已付款消息


        OrderMessage orderMessage = new OrderMessage();


        orderMessage.setOrderSn(order.getSn());