白酒拍卖
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
2024-07-18 95639988ed630dae4b2461b5f6c3ccb6d9af8d86 
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java


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


import com.google.common.collect.Lists;


import com.ruoyi.common.core.constant.CacheConstants;


import com.ruoyi.common.core.constant.SecurityConstants;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;


import com.ruoyi.common.core.enums.AuditStatusEnum;


import com.ruoyi.common.core.enums.BondStatusEnum;


@@ -37,7 +36,18 @@


import com.ruoyi.order.util.OrderUtil;


import com.ruoyi.order.util.SinataUtil;


import com.ruoyi.system.api.constants.DelayTaskEnum;


import com.ruoyi.system.api.domain.*;


import com.ruoyi.system.api.domain.AuctionSalesroom;


import com.ruoyi.system.api.domain.CouponMember;


import com.ruoyi.system.api.domain.CustomConfig;


import com.ruoyi.system.api.domain.DelayTask;


import com.ruoyi.system.api.domain.GoodsGroupPurchase;


import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;


import com.ruoyi.system.api.domain.GoodsSeckill;


import com.ruoyi.system.api.domain.GoodsSku;


import com.ruoyi.system.api.domain.Member;


import com.ruoyi.system.api.domain.MemberAddress;


import com.ruoyi.system.api.domain.Order;


import com.ruoyi.system.api.domain.OrderAuctionBond;


import com.ruoyi.system.api.domain.dto.CouponMemberDTO;


import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;


import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;


@@ -61,7 +71,10 @@


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.time.LocalDateTime;


import java.util.*;


import java.util.Collection;


import java.util.List;


import java.util.Map;


import java.util.Set;


import java.util.concurrent.TimeUnit;


import java.util.function.Function;


import java.util.regex.Matcher;


@@ -72,6 +85,7 @@


import org.redisson.api.RLock;


import org.redisson.api.RedissonClient;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




/**


 * <p>


@@ -164,6 +178,7 @@


        order.setSkuName(OrderDTO.getSkuName());


        order.setPrice(OrderDTO.getPrice());


        order.setCoverPic(OrderDTO.getCoverPic());


        order.setOrderTimeSx(OrderDTO.getOrderTimeSx());


        this.save(order);




        if (OrderDTO.getOrderFrom().getCode()==4){


@@ -1177,8 +1192,9 @@


            pageVO = PageDTO.empty(page);


        }


        pageVO = PageDTO.of(page, MgtOrderVO.class);


        List<MgtOrderVO> voList = pageVO.getList();


        if (query.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {


            List<MgtOrderVO> list = pageVO.getList();


            List<MgtOrderVO> list = voList;


            // 封装参数查询拍卖会


            Set<Long> auctionSalesroomGoodsIdSet = list.stream()


                    .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS)


@@ -1243,6 +1259,19 @@


                }


            });


        }


        Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)


                .collect(Collectors.toSet());


        List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)


                .getData();


        Map<Long, Member> memberMap = data.stream()


                .collect(Collectors.toMap(Member::getId, e -> e));


        voList = voList.stream().peek(order -> {


            Member member = memberMap.get(order.getMemberId());


            if (StringUtils.isNotNull(member)) {


                order.setNickname(member.getNickname());


                order.setPhone(member.getPhone());


            }


        }).collect(Collectors.toList());


        return pageVO;


    }




@@ -1274,7 +1303,7 @@


            }


        }


        // 查询售后信息


        if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {


        if (order.getIsRequest() == 2) {


            OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(


                    Wrappers.lambdaQuery(OrderReturnRequest.class)


                            .eq(OrderReturnRequest::getOrderId,


@@ -1345,6 +1374,7 @@


     * @param id 订单id


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public void refund(Long id) {


        Order order = getOrder(id);


        String orderNo = order.getOrderNo();


@@ -1367,6 +1397,8 @@


            orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);


            orderReturnRequestService.save(orderReturnRequest);


        }


        order.setIsRequest(2);


        this.updateById(order);


    }




    private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {


@@ -1401,7 +1433,7 @@


        Order order = getOrder(id);


        if (order.getOrderStatus() == OrderStatusEnum.FINISHED) {


            OrderReturnRequest orderReturnRequest = new OrderReturnRequest();


            order.setOrderStatus(OrderStatusEnum.AFTER_SALE);


            order.setIsRequest(2);


            this.updateById(order);


            MgtAfterSaleSettingDTO data = sysUserClient.getAfterSaleSetting().getData();


            if (StringUtils.isNull(data)) {


@@ -1484,4 +1516,15 @@


    public List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime) {


        return baseMapper.getStaticsOrderList(startTime, endTime);


    }




    @Override


    public List<Order> getOrderListByMubres(List<String> mubres) {


        return this.lambdaQuery().in(Order::getGroupNo, mubres).list();


    }




    @Override


    public void updateOrderStatusByMubres(List<String> formedGroupMubres) {


        this.lambdaUpdate().set(Order::getIsOrder, 1).in(Order::getGroupNo, formedGroupMubres)


                .update();


    }


}