绿满筐商城java服务
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
peng
1 天以前 672637fa4a4914ec9667cb15f70b67482b8a0e5e 
 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,7 +88,9 @@


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 io.reactivex.rxjava3.core.Maybe;


import lombok.extern.slf4j.Slf4j;


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


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


@@ -106,6 +113,10 @@


import java.io.InputStream;


import java.math.BigDecimal;


import java.net.URLEncoder;


import java.text.SimpleDateFormat;


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 +224,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 +264,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 +828,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 +849,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 +872,7 @@


                }


            }


            if (!couponVirtuals.isEmpty()) {


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


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


                couponVirtualService.saveBatch(couponVirtuals);


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


@@ -854,7 +890,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 +1275,197 @@


        return order;


    }




    @Override


    public Result getOrderCount(StatisticsQueryParam queryParam) {


        Date startTime = null;


        Date endTime = new Date(); // 结束时间默认是当前时间


        List<String> dateList = new ArrayList<>();




        Calendar calendar = Calendar.getInstance(); // 用于日期计算的日历实例


        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


        int days = 0;


        switch (queryParam.getSearchType()) {


            case "TODAY":


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


                calendar.setTime(new Date()); // 重置为当前时间


                calendar.set(Calendar.HOUR_OF_DAY, 0); // 小时设为0（24小时制）


                calendar.set(Calendar.MINUTE, 0);      // 分钟设为0


                calendar.set(Calendar.SECOND, 0);      // 秒设为0


                calendar.set(Calendar.MILLISECOND, 0); // 毫秒设为0


                startTime = calendar.getTime();        // 得到今天0点的Date对象


                dateList.add(sdf.format(startTime));


                break;


            case "YESTERDAY":


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


                calendar.setTime(new Date());


                calendar.add(Calendar.DATE, -1); // 日期减1天（变为昨天）




                // 设置昨天0点


                calendar.set(Calendar.HOUR_OF_DAY, 0);


                calendar.set(Calendar.MINUTE, 0);


                calendar.set(Calendar.SECOND, 0);


                calendar.set(Calendar.MILLISECOND, 0);


                startTime = calendar.getTime();




                // 设置昨天23:59:59.999


                calendar.set(Calendar.HOUR_OF_DAY, 23);


                calendar.set(Calendar.MINUTE, 59);


                calendar.set(Calendar.SECOND, 59);


                calendar.set(Calendar.MILLISECOND, 999);


                endTime = calendar.getTime();




                dateList.add(sdf.format(startTime));


                break;


            case "LAST_SEVEN":


                // 过去七天：从7天前0点到现在（含今天共7天）


                calendar.setTime(new Date());


                calendar.add(Calendar.DATE, -6); // 日期减6天（7天前的今天）




                // 设置7天前0点


                calendar.set(Calendar.HOUR_OF_DAY, 0);


                calendar.set(Calendar.MINUTE, 0);


                calendar.set(Calendar.SECOND, 0);


                calendar.set(Calendar.MILLISECOND, 0);


                startTime = calendar.getTime();




                days = 7;


                // 循环生成7天的日期字符串


                Calendar tempCalendar = Calendar.getInstance();


                tempCalendar.setTime(startTime);


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


                    dateList.add(sdf.format(tempCalendar.getTime()));


                    tempCalendar.add(Calendar.DATE, 1); // 每天累加1天


                }


                break;


            case "LAST_THIRTY":


                // 过去30天：从30天前0点到现在（含今天共30天）


                calendar.setTime(new Date());


                calendar.add(Calendar.DATE, -29); // 日期减29天（30天前的今天）




                // 设置30天前0点


                calendar.set(Calendar.HOUR_OF_DAY, 0);


                calendar.set(Calendar.MINUTE, 0);


                calendar.set(Calendar.SECOND, 0);


                calendar.set(Calendar.MILLISECOND, 0);


                startTime = calendar.getTime();




                days = 30;


                // 循环生成30天的日期字符串


                Calendar tempCalendar30 = Calendar.getInstance();


                tempCalendar30.setTime(startTime);


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


                    dateList.add(sdf.format(tempCalendar30.getTime()));


                    tempCalendar30.add(Calendar.DATE, 1); // 每天累加1天


                }


                break;


            default:


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


        }


        List<Map<String, Object>> maps = baseMapper.selectOrderCountByDay(startTime,endTime);




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


                .collect(Collectors.toMap(


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


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


                ));




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


        for (String date : dateList) {


            // 核心：存在则取查询结果，不存在则补0


            orderCounts.add(dayCountMap.getOrDefault(date, 0L));


        }






        return Result.ok().data(orderCounts);


    }




    @Override


    public Result getOrderTimePeriod(StatisticsQueryParam queryParam) {


        Date startTime = null;


        Date endTime = new Date(); // 结束时间默认是当前时间


        List<String> dateList = new ArrayList<>();




        Calendar calendar = Calendar.getInstance(); // 用于日期计算的日历实例


        for (int i =0;i<=24;i++){


            dateList.add(i + "点");


        }


        switch (queryParam.getSearchType()) {


            case "TODAY":


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


                calendar.setTime(new Date()); // 重置为当前时间


                calendar.set(Calendar.HOUR_OF_DAY, 0); // 小时设为0（24小时制）


                calendar.set(Calendar.MINUTE, 0);      // 分钟设为0


                calendar.set(Calendar.SECOND, 0);      // 秒设为0


                calendar.set(Calendar.MILLISECOND, 0); // 毫秒设为0


                startTime = calendar.getTime();        // 得到今天0点的Date对象


                break;


            case "YESTERDAY":


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


                calendar.setTime(new Date());


                calendar.add(Calendar.DATE, -1); // 日期减1天（变为昨天）




                // 设置昨天0点


                calendar.set(Calendar.HOUR_OF_DAY, 0);


                calendar.set(Calendar.MINUTE, 0);


                calendar.set(Calendar.SECOND, 0);


                calendar.set(Calendar.MILLISECOND, 0);


                startTime = calendar.getTime();




                // 设置昨天23:59:59.999


                calendar.set(Calendar.HOUR_OF_DAY, 23);


                calendar.set(Calendar.MINUTE, 59);


                calendar.set(Calendar.SECOND, 59);


                calendar.set(Calendar.MILLISECOND, 999);


                endTime = calendar.getTime();




                break;


            case "LAST_SEVEN":


                // 过去七天：从7天前0点到现在（含今天共7天）


                calendar.setTime(new Date());


                calendar.add(Calendar.DATE, -6); // 日期减6天（7天前的今天）




                // 设置7天前0点


                calendar.set(Calendar.HOUR_OF_DAY, 0);


                calendar.set(Calendar.MINUTE, 0);


                calendar.set(Calendar.SECOND, 0);


                calendar.set(Calendar.MILLISECOND, 0);


                startTime = calendar.getTime();




                break;


            case "LAST_THIRTY":


                // 过去30天：从30天前0点到现在（含今天共30天）


                calendar.setTime(new Date());


                calendar.add(Calendar.DATE, -29); // 日期减29天（30天前的今天）




                // 设置30天前0点


                calendar.set(Calendar.HOUR_OF_DAY, 0);


                calendar.set(Calendar.MINUTE, 0);


                calendar.set(Calendar.SECOND, 0);


                calendar.set(Calendar.MILLISECOND, 0);


                startTime = calendar.getTime();




                break;


            default:


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


        }


        List<Map<String, Object>> maps = baseMapper.selectOrderTimePeriod(startTime,endTime);




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


                .collect(Collectors.toMap(


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


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


                ));




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


        for (String date : dateList) {


            // 核心：存在则取查询结果，不存在则补0


            orderCounts.add(dayCountMap.getOrDefault(date, 0L));


        }






        return Result.ok().data(orderCounts);


    }




    /**


     * 虚拟成团


     *