修改bug

puzhibing

1 天以前 6058af744bdf4fe6a3856c46fe31cfb4dbd8e255

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -93,6 +93,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -401,6 +402,17 @@
        appSureOrderVo.setOrderPayMoney(orderPayMoney);
        // 设置订单商品列表
        appSureOrderVo.setAppSureOrderGoodsVoList(appSureOrderGoodsVoList);
        appSureOrderVo.setLotteryDraw(false);
        // 返回AppPlaceOrderVo对象
        List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(2).getData();
        if (data.size() > 0) {
            BigDecimal finalOrderPayMoney = orderPayMoney;
            List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
            if (collect.size() > 0) {
                appSureOrderVo.setLotteryDraw(true);
                appSureOrderVo.setLotteryEventId(collect.get(0).getId());
            }
        }
        return appSureOrderVo;
    }

@@ -509,6 +521,17 @@
        appPanicBuyVo.setOrderGoodsMoney(orderGoodsMoney);
        appPanicBuyVo.setOrderPayDeposit(orderPayDeposit);
        appPanicBuyVo.setOrderPayMoney(orderPayMoney);
        appPanicBuyVo.setLotteryDraw(false);
        // 返回AppPlaceOrderVo对象
        List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(2).getData();
        if (data.size() > 0) {
            BigDecimal finalOrderPayMoney = orderPayMoney;
            List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
            if (collect.size() > 0) {
                appPanicBuyVo.setLotteryDraw(true);
                appPanicBuyVo.setLotteryEventId(collect.get(0).getId());
            }
        }
        return appPanicBuyVo;
    }

@@ -1600,16 +1623,15 @@
        appPlaceOrderVo.setSignType(payArr[4]);
        appPlaceOrderVo.setPaySign(payArr[5]);
        appPlaceOrderVo.setPrepayId(orderPayment.getPrepayId());
        appPlaceOrderVo.setLotteryDraw(false);
        // 返回AppPlaceOrderVo对象
        List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(2).getData();
        if (data.size() > 0) {
            List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(order.getPayMoney()) >= 0).collect(Collectors.toList());
            appPlaceOrderVo.setLotteryDraw(collect.size() > 0);
            List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(order.getPayMoney()) <= 0).collect(Collectors.toList());
            if (collect.size() > 0) {
                appPlaceOrderVo.setLotteryDraw(true);
                appPlaceOrderVo.setLotteryEventId(collect.get(0).getId());
            }
        } else {
            appPlaceOrderVo.setLotteryDraw(false);
        }
        return appPlaceOrderVo;
    }
@@ -3166,7 +3188,13 @@
                consumerGoodsService.sendGoodsGift(giftSendDtoList);
                //抽奖奖品中的平台商品需要生成订单数据
                if (memberGiftRecord.getPrizeFrom() == 2) {
                    addOrder(memberGiftRecord.getShopId(), memberGiftRecord.getUserId(), goods, memberGiftRecord.getGoodsNumber(), memberGiftRecord.getGiftId());
                    Order one = this.getOne(new QueryWrapper<Order>().eq("activity_id", memberGiftRecord.getGiftId()).eq("order_from", 4));
                    if(null == one){
                        addOrder(memberGiftRecord.getShopId(), memberGiftRecord.getUserId(), goods, memberGiftRecord.getGoodsNumber(), memberGiftRecord.getGiftId(), 3);
                    }else{
                        one.setOrderStatus(3);
                        this.updateById(one);
                    }
                }
                break;
            case 3:
@@ -3204,23 +3232,23 @@
    
    
    /**
     * 核销抽奖的平台商品生成订单
     * 抽奖的平台商品生成订单--待审核
     *
     * @param shopId
     * @param userId
     * @param goods
     * @param goodsNum
     */
    public void addOrder(Long shopId, Long userId, Goods goods, Integer goodsNum, String giftId) {
    public void addOrder(Long shopId, Long userId, Goods goods, Integer goodsNum, String giftId, Integer status) {
        Order order = new Order();
        order.setOrderId(IdUtils.simpleUUID());
        order.setDelFlag(0);
        order.setOrderStatus(3);
        order.setOrderStatus(status);
        order.setOrderNo(CodeFactoryUtil.getShopOrderNo());
        order.setOrderFrom(4);
        order.setShopId(shopId);
        order.setUserId(userId);
        order.setOrderMoney(BigDecimal.ZERO);
        order.setOrderMoney(goods.getSalesPrice());
        order.setCouponMoney(BigDecimal.ZERO);
        order.setDiscountMoney(BigDecimal.ZERO);
        order.setReceivableMoney(BigDecimal.ZERO);
@@ -3966,6 +3994,8 @@
        MgtOrderTotal mgtOrderTotalFirst = orderMapper.totalOrderFirst(mgtShopOrderPageDto);
        MgtOrderTotal mgtOrderTotalSecond = orderMapper.totalOrderSecond(mgtShopOrderPageDto);
        MgtOrderTotal mgtOrderTotalThird = orderMapper.totalOrderThird(mgtShopOrderPageDto);
        MgtOrderTotal mgtOrderTotalFour = orderMapper.totalOrderFour(mgtShopOrderPageDto);

        mgtOrderTotal.setOrderTotal(mgtOrderTotalFirst.getOrderTotal());
        mgtOrderTotal.setOrderMoneyTotal(mgtOrderTotalFirst.getOrderMoneyTotal());
        mgtOrderTotal.setShopOrderTotal(mgtOrderTotalSecond.getShopOrderTotal());
@@ -4041,7 +4071,7 @@
            Map<Long, MgtSimpleShopVo> shopMap = null;
            Map<Long, MgtSimpleMemberVo> userMap = null;
            if (shopIdSet != null && !shopIdSet.isEmpty()) {
                String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
                String shopJoinedString = String.join(",", shopIdSet.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toList()));
                MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
                mgtBaseBathDto.setIds(shopJoinedString);
                List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
@@ -4362,7 +4392,7 @@
     */
    private List<MgtMapBigTotalVo> bigListRemoveNull(List<MgtMapBigTotalVo> MgtMapIntTotalVos) {
        for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
            if (StringUtils.isBlank(MgtMapIntTotalVos.get(i).getMapKey())) {
            if(MgtMapIntTotalVos.get(i).getMapKey().isEmpty()){
                MgtMapIntTotalVos.remove(i);
            }
        }
@@ -4951,8 +4981,33 @@
        //获取来源销售排名
        List<MgtMapBigTotalVo> orderFromList = orderMapper.listPlTotalOrderTotalOrderFrom(mgtBasePlatformDto);
        if (orderFromList != null && orderFromList.size() > 0) {

            MgtMapBigTotalVo duoyin = new MgtMapBigTotalVo();
            duoyin.setMapKey("抖音");
            duoyin.setMapValue(totalOrderTotalVo.getDouyinAmount());

            MgtMapBigTotalVo kauishou = new MgtMapBigTotalVo();
            kauishou.setMapKey("快手");
            kauishou.setMapValue(totalOrderTotalVo.getKuaishouAmount());

            MgtMapBigTotalVo meituan = new MgtMapBigTotalVo();
            meituan.setMapKey("美团");
            meituan.setMapValue(totalOrderTotalVo.getMeituanAmount());
            orderFromList.add(duoyin);
            orderFromList.add(kauishou);
            orderFromList.add(meituan);
            orderFromList = bigListRemoveNull(orderFromList);
            mgtTotalOrderTotalVo.setOrderFromRankList(orderFromList);


            //排行
            List<MgtMapBigTotalVo> sortedList = orderFromList.stream()
                    // 按 mapValue 降序排序，处理 null 值（若 mapValue 可能为 null）
                    .sorted(Comparator.comparing(
                            MgtMapBigTotalVo::getMapValue,
                            Comparator.nullsLast(BigDecimal::compareTo).reversed()
                    ))
                    .collect(Collectors.toList());
            mgtTotalOrderTotalVo.setOrderFromRankList(sortedList);
        }
        //订单分布
        //日期全部时固定为5天
@@ -7305,6 +7360,11 @@
        }
        mgtBasePlatformDto.setShopIdList(shopIdList);
        // 从数据库中获取第三方订单统计
        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        mgtBasePlatformDto.setStartTime(LocalDate.parse(mgtBasePlatformDto.getStartDate(), dateFormatter)
                .atStartOfDay());
        mgtBasePlatformDto.setEndTime(LocalDate.parse(mgtBasePlatformDto.getEndDate(), dateFormatter)
                .atTime(LocalTime.MAX));
         vo = orderMapper.getPlTotalThirdOrderStatics(mgtBasePlatformDto);
        return vo;
    }