绿满筐商城java服务
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zxl
昨天 933c5dd8ed6715290c6863a8a8d2797582f62af7 
 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java


@@ -10,6 +10,7 @@


import cn.hutool.poi.excel.ExcelReader;


import cn.hutool.poi.excel.ExcelUtil;


import cn.hutool.poi.excel.ExcelWriter;


import cn.lili.base.Result;


import cn.lili.common.enums.ClientTypeEnum;


import cn.lili.common.enums.PromotionTypeEnum;


import cn.lili.common.enums.ResultCode;


@@ -25,11 +26,14 @@


import cn.lili.common.utils.StringUtils;


import cn.lili.common.vo.ResultMessage;


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


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


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


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


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


import cn.lili.modules.lmk.domain.entity.CouponVirtual;


import cn.lili.modules.lmk.domain.vo.OrderCountVO;


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


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


import cn.lili.modules.lmk.service.CouponVirtualService;


import cn.lili.modules.member.entity.dos.Member;


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


@@ -53,6 +57,7 @@


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


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


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


import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;


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


import cn.lili.modules.store.service.StoreDetailService;


import cn.lili.modules.system.aspect.annotation.SystemLogPoint;


@@ -83,6 +88,7 @@


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import lombok.extern.slf4j.Slf4j;


import org.apache.poi.ss.usermodel.Cell;


@@ -106,6 +112,9 @@


import java.io.InputStream;


import java.math.BigDecimal;


import java.net.URLEncoder;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.LocalTime;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.stream.Collectors;


@@ -213,6 +222,8 @@


    @Autowired


    private RedissonClient redissonClient;




    @Autowired


    private GoodsSkuService goodsSkuService;


    private final static  String LOCK_ORDER_NO_MQ="lock_order_no_mq:";


    private final static  String LOCK_EDIT_ORDER_ADDRESS="lock_edit_order_address:";


    private final static  String LOCK_COUPON_CARD="lock_coupon_card:";


@@ -251,7 +262,21 @@


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


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


//                        orderItems.add(e);


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


                        //特殊处理线上礼品卡问题


                        String skuId = sku.getGoodsSku().getId();


                        GoodsSku skuInfo = goodsSkuService.getById(skuId);


                        OrderItem orderItem = new OrderItem(sku, item, tradeDTO);


                        if (skuInfo != null) {


                            String goodsId = skuInfo.getGoodsId();


                            Goods goodsInfo = goodsService.getById(goodsId);


                            if (goodsInfo != null&& VirtualGoodsTypeEnum.COUPON.name().equals(goodsInfo.getVirtualGoodsType())) {


                                String couponId = skuInfo.getCouponId();


                                String couponName = skuInfo.getCouponName();


                                orderItem.setCouponId(couponId);


                                orderItem.setCouponName(couponName);


                            }


                        }


                        orderItems.add(orderItem);


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


                    }


            );


@@ -801,12 +826,19 @@


    @OrderLogPoint(description = "'订单['+#orderSn+']核销，核销码['+#verificationCode+']'", orderSn = "#orderSn")


    @Transactional(rollbackFor = Exception.class)


    public Order take(String orderSn, String verificationCode) {


        log.info("订单核销订单号为：{}，核销码为{}",orderSn,verificationCode);


        Order order;


        RLock lock = redissonClient.getLock(LOCK_COUPON_CARD + orderSn);


        try {


             lock.lock();


            //获取订单信息


            order = this.getBySn(orderSn);


            log.info("获取到的订单信息为{}",JSON.toJSONString(order));


            //订单幂等问题


            if (OrderStatusEnum.COMPLETED.name().equals(order.getOrderStatus())) {


                throw new ServiceException("当前订单已完成无法再次核验");


            }




            //检测虚拟订单信息


            checkVerificationOrder(order, verificationCode);


            order.setOrderStatus(OrderStatusEnum.COMPLETED.name());


@@ -815,6 +847,7 @@


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


            List<CouponVirtual> couponVirtuals = new  ArrayList<>();


            for (OrderItem orderItem : orderItems) {


                log.info("获取到的子订单信息为{}",JSON.toJSONString(orderItem));


                String couponId = orderItem.getCouponId();


                if (StringUtils.isBlank(couponId)) {


                    continue;


@@ -837,6 +870,7 @@


                }


            }


            if (!couponVirtuals.isEmpty()) {


                log.info("生成的兑换卡为{}",JSON.toJSONString(couponVirtuals));


                order.setCouponFlag(CouPonFlagEnum.COUPON.name());


                couponVirtualService.saveBatch(couponVirtuals);


                //更新状态用于后续小程序判断弹出卷列表


@@ -854,7 +888,7 @@




    private static CouponVirtual getCouponVirtual(OrderItem orderItem) {


        CouponVirtual couponVirtual = new CouponVirtual();


        couponVirtual.setOrderId(orderItem.getSn());


        couponVirtual.setOrderId(orderItem.getOrderSn());


        couponVirtual.setCouponId(orderItem.getCouponId());


        couponVirtual.setCouponName(orderItem.getCouponName());


        couponVirtual.setGoodsId(orderItem.getGoodsId());


@@ -1239,6 +1273,65 @@


        return order;


    }




    @Override


    public Result getOrderCount(StatisticsQueryParam queryParam) {


        LocalDateTime startTime = null;


        LocalDateTime endTime = LocalDateTime.now(); // 结束时间默认是当前时间


        int days = 0;




        switch (queryParam.getSearchType()) {


            case "TODAY":


                // 今天：从今天0点到现在


                startTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);


                days = 1;


                break;


            case "YESTERDAY":


                // 昨天：从昨天0点到昨天23:59:59


                LocalDate yesterday = LocalDate.now().minusDays(1);


                startTime = LocalDateTime.of(yesterday, LocalTime.MIN);


                endTime = LocalDateTime.of(yesterday, LocalTime.MAX);


                days = 1;


                break;


            case "LAST_SEVEN":


                // 过去七天：从7天前0点到现在


                startTime = LocalDateTime.of(LocalDate.now().minusDays(6), LocalTime.MIN);


                days = 7;


                break;


            case "LAST_THIRTY":


                // 过去30天：从30天前0点到现在


                startTime = LocalDateTime.of(LocalDate.now().minusDays(29), LocalTime.MIN);


                days = 30;


                break;


            default:


                return Result.error("不支持的时间范围类型");


        }




// 2. 查询该时间范围内的每日订单数量（按日期分组）


//        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();


//        queryWrapper.between(Order::getCreateTime, startTime, endTime);


//                // 按日期分组（提取日期部分）


//


//        // 执行查询，返回日期和数量的映射（day -> count）


//        List<Map<String, Object>> maps = baseMapper.selectMaps(queryWrapper);


//        Map<String, Long> dayCountMap = maps.stream()


//                .collect(Collectors.toMap(


//                        map -> map.get("day").toString(),  // 日期字符串（如2023-09-19）


//                        map -> Long.valueOf(map.get("count").toString())  // 订单数量


//                ));


//


//        // 3. 生成完整的日期列表（确保即使某天没有订单也会返回0）


//        List<Long> orderCounts = new ArrayList<>(days);


//        for (int i = 0; i < days; i++) {


//            // 计算当前循环对应的日期（从startTime开始的第i天）


//            LocalDate currentDate = startTime.toLocalDate().plusDays(i);


//            String dateStr = currentDate.toString(); // 转为yyyy-MM-dd格式


//            // 从映射中获取数量，没有则为0


//            orderCounts.add(dayCountMap.getOrDefault(dateStr, 0L));


//        }




        return null;


    }




    /**


     * 虚拟成团


     *