09.25心愿求购新增

mitao

2024-11-01 a53a1f481278f981bab8030853b353a823a9cd81

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

@@ -5,21 +5,26 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
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;
import com.ruoyi.common.core.enums.CouponUseEnum;
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.OrderTypeEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.enums.PointStatusEnum;
import com.ruoyi.common.core.enums.RequestTypeEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
@@ -36,8 +41,22 @@
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.order.vo.HomeGoodsSkuDTO1;
import com.ruoyi.order.vo.WdOrderVO;
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.PromotionWishRecommend;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -45,6 +64,7 @@
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
@@ -52,16 +72,24 @@
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.MgtPromotionWishRecommendVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.seata.spring.annotation.GlobalTransactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -69,9 +97,13 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.map.HashedMap;
import org.jetbrains.annotations.NotNull;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
@@ -81,7 +113,9 @@
 * @author mitao
 * @since 2024-05-16
 */
@Slf4j
@Service
@SuppressWarnings("unchecked")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {

    @Resource
@@ -146,6 +180,9 @@
            order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
            order.setOrderNo(OrderUtil.getOrderNoForPrefix("PM"));
            order.setIsOrder(1);
            if (OrderDTO.getAuctionType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS)) {
                order.setAuctionSalesroomId(OrderDTO.getAuctionSalesroomId());
            }
        }
        order.setOrderTime(OrderDTO.getOrderTime());
        order.setOrderFrom(OrderDTO.getOrderFrom());
@@ -164,7 +201,11 @@
        order.setSkuName(OrderDTO.getSkuName());
        order.setPrice(OrderDTO.getPrice());
        order.setCoverPic(OrderDTO.getCoverPic());
        order.setOrderTimeSx(OrderDTO.getOrderTimeSx());
        order.setGoodsId(OrderDTO.getGoodsId());
        this.save(order);



        if (OrderDTO.getOrderFrom().getCode()==4){
            if (OrderDTO.getAuctionType().getCode()==1){
@@ -180,7 +221,6 @@
            if (OrderDTO.getAuctionType().getCode()==2){
                LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
                wrapper.eq(OrderAuctionBond::getMemberId,OrderDTO.getMemberId());
                wrapper.eq(OrderAuctionBond::getAuctionGoodsId,OrderDTO.getGoodsSkuId());
                wrapper.eq(OrderAuctionBond::getBoundStatus,2);
                wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,OrderDTO.getAuctionSalesroomId());
                wrapper.eq(OrderAuctionBond::getBondType,2);
@@ -216,7 +256,7 @@
     */
    @Override
    public Integer getGroupPurchasesGoodsNum(Long id) {
        List<Order> list = this.lambdaQuery().eq(Order::getId, id)
        List<Order> list = this.lambdaQuery().eq(Order::getGoodsSkuId, id)
                .in(Order::getOrderStatus, OrderStatusEnum.TO_BE_SHIPPED,
                        OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
        return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
@@ -244,14 +284,23 @@
    }

    @Override
    public Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return baseMapper.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO);
    }

    @Override
    public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
    }

    @Override
    public List<OrderVO> getOrderByGroupPurchaseMemberList1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return null;
    }

    @Override
    @Synchronized
    public MemberTiOrderVO saveMemberOrder(MemberOrderDTO memberOrderDTO) {

        MemberTiOrderVO memberOrderVO=new MemberTiOrderVO();
        BigDecimal pice=new BigDecimal(0);

@@ -269,6 +318,10 @@
            order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
            order.setOrderNo(OrderUtil.getOrderNoForPrefix("TG"));
            order.setIsOrder(2);
        }
        if (memberOrderDTO.getOrderFrom() == OrderFromEnum.WISH_ORDER.getCode()) {
            order.setOrderFrom(OrderFromEnum.WISH_ORDER);
            order.setOrderNo(OrderUtil.getOrderNoForPrefix("QG"));
        }
        if (memberOrderDTO.getPaymentMethod()==1){
            order.setPaymentMethod(PaymentMethodEnum.WECHAT);
@@ -293,6 +346,7 @@
                order.setSkuName(goodsSku.getSkuName());
                order.setPrice(goodsSku.getPrice());
                order.setCoverPic(goodsSku.getCoverPic());
                order.setGoodsId(goodsSku.getId());
            }
            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            memberOrderVO.setPrice(goodsSku.getPrice());
@@ -322,6 +376,7 @@

            MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
            memberOrderDTO1.setMemberId(order.getMemberId());
            memberOrderDTO1.setId(order.getId());
            memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
            Integer num1=0;
@@ -333,9 +388,12 @@


            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (data.getLimitNumber()<num1) {
                throw new ServiceException("该商品已售罄，暂无库存");
            if (data.getLimitNumber()!=0){
                if (data.getLimitNumber()<num1) {
                    throw new ServiceException("对不起，大于商品购买数");
                }
            }


            order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -359,6 +417,7 @@
            order.setPrice(data.getSeckillPrice());
            order.setCoverPic(goodsSku.getCoverPic());
            order.setSjPrice(goodsSku.getPrice());
            order.setGoodsId(goodsSku.getId());
            redisService.setCacheObject(CacheConstants.SECKILL_GOODS + data.getId(), surpNum - memberOrderDTO.getGoodsQuantity());
        }
        if (memberOrderDTO.getOrderFrom()==3){
@@ -370,10 +429,29 @@
            if (data.getStartStatus().getCode()==0){
                throw new ServiceException("该商品未开始");
            }
            Integer m=data.getCurrentNumber()+1;
            GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (goodsSeckiGoodsGroupPurchaseInfo==null){
                GoodsGroupPurchase data1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
                Integer num= data.getGroupSize()*data.getLimitNumber();
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                if (goodsSku.getStock()<num){
                    throw new ServiceException("该商品库存不足无法团购");
                }

                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
                goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-num);
                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
                        SecurityConstants.INNER);

            }
            /*Integer m=data.getCurrentNumber()+1;
            if (m>data.getGroupSize()){
                throw new ServiceException("对不起，大成团人数");
            }
            }*/



            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -387,6 +465,34 @@
            order.setPrice(data.getGroupPurchasePrice());
            order.setCoverPic(goodsSku.getCoverPic());
            order.setSjPrice(goodsSku.getPrice());
            order.setGoodsId(goodsSku.getId());
        }
        if (memberOrderDTO.getOrderFrom() == OrderFromEnum.WISH_ORDER.getCode()) {
            // 远程调用营销服务，获取推荐商品信息
            PromotionWishRecommend recommend = promotionClient.getPromotionWishRecommend(
                    memberOrderDTO.getGoodsSkuId(),
                    SecurityConstants.INNER).getData();
            if (Objects.isNull(recommend)) {
                throw new ServiceException("推荐商品不存在");
            }
            if (recommend.getExpireTime().isBefore(LocalDateTime.now())) {
                throw new ServiceException("推荐商品已过期");
            }
            if (recommend.getAvailableNum().compareTo(memberOrderDTO.getGoodsQuantity()) < 0) {
                throw new ServiceException("推荐商品可购数量不足");
            }
            // 远程调用，更新可购数量
            Integer res = promotionClient.subRecommendAvailableNum(
                    memberOrderDTO.getGoodsQuantity(),
                    recommend.getId(), SecurityConstants.INNER).getData();
            if (res == 0) {
                throw new ServiceException("推荐商品可购数量不足");
            }
            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            memberOrderVO.setPrice(recommend.getSellingPrice());
            memberOrderVO.setCoverPic(recommend.getGoodsImageUrl());
            memberOrderVO.setSkuName(recommend.getGoodsName());
            pice = recommend.getSellingPrice();
        }
        order.setOrderRemark(memberOrderDTO.getOrderRemark());
        order.setMemberId(memberOrderDTO.getMemberId());
@@ -417,6 +523,16 @@
            memberOrderVO.setReceiverCity(data.getReceiverCity());
            memberOrderVO.setReceiverDetailAddress(data.getDetailedAddress());
            memberOrderVO.setReceiverphone(data.getRecipientPhone());
        } else {
            order.setReceiverName(memberOrderDTO.getReceiverName());
            order.setReceiverCity(memberOrderDTO.getReceiverCity());
            order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
            order.setReceiverPhone(memberOrderDTO.getReceiverphone());

            memberOrderVO.setReceiverName(memberOrderDTO.getReceiverName());
            memberOrderVO.setReceiverCity(memberOrderDTO.getReceiverCity());
            memberOrderVO.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
            memberOrderVO.setReceiverphone(memberOrderDTO.getReceiverphone());
        }

        order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -491,24 +607,23 @@
                    memberOrderVO.setCoverPic(goodsSku.getCoverPic());
                    memberOrderVO.setSkuName(goodsSku.getSkuName());
                }


            if (order.getOrderFrom().getCode()==2){
                MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
                memberOrderDTO1.setMemberId(order.getMemberId());
                memberOrderDTO1.setId(order.getId());
                memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
                Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
                Integer num1=0;
                if (num!=null){
                    num1 =num+order.getGoodsQuantity();
                }else{
                    num1=order.getGoodsQuantity();
                }
                    if (num!=null){
                        num1 =num+memberOrderDTO.getGoodsQuantity();
                    }else{
                        num1=order.getGoodsQuantity();
                    }

                GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();

                if (num1!=order.getGoodsQuantity()){

                    if (data.getLimitNumber()<num1){
                        throw new ServiceException("对不起，大于商品购买数");
                    }else{
@@ -544,9 +659,9 @@
                    memberOrderVO.setSkuName(goodsSku.getSkuName());
                    memberOrderVO.setYouhiPrice(data.getSeckillPrice());

                }

        }  if (order.getOrderFrom().getCode()==3){
            }
            if (order.getOrderFrom().getCode() == 3) {
                order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
                GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
@@ -577,6 +692,40 @@
                    }
                }
            }
            if (memberOrderDTO.getOrderFrom() == OrderFromEnum.WISH_ORDER.getCode()) {
                // 远程调用营销服务，获取推荐商品信息
                PromotionWishRecommend recommend = promotionClient.getPromotionWishRecommend(
                        memberOrderDTO.getGoodsSkuId(),
                        SecurityConstants.INNER).getData();
                if (Objects.isNull(recommend)) {
                    throw new ServiceException("推荐商品不存在");
                }
                Integer availableNum = recommend.getAvailableNum() + order.getGoodsQuantity();
                if (availableNum.compareTo(memberOrderDTO.getGoodsQuantity()) < 0) {
                    throw new ServiceException("推荐商品可购数量不足");
                }
                // 如果最新购买数比锁定库存数大，则扣减多出来的商品数量，否则恢复多出的锁定库存
                if (memberOrderDTO.getGoodsQuantity().compareTo(order.getGoodsQuantity()) > 0) {
                    // 远程调用，更新可购数量
                    Integer res = promotionClient.subRecommendAvailableNum(
                            memberOrderDTO.getGoodsQuantity() - order.getGoodsQuantity(),
                            recommend.getId(), SecurityConstants.INNER).getData();
                    if (res == 0) {
                        throw new ServiceException("推荐商品可购数量不足");
                    }
                } else {
                    promotionClient.addRecommendAvailableNum(
                            order.getGoodsQuantity() - memberOrderDTO.getGoodsQuantity(),
                            recommend.getId(), SecurityConstants.INNER);
                }
                order.setTotalAmount(recommend.getSellingPrice()
                        .multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
                order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
                memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
                memberOrderVO.setPrice(recommend.getSellingPrice());
                memberOrderVO.setCoverPic(recommend.getGoodsImageUrl());
                memberOrderVO.setSkuName(recommend.getGoodsName());
            }
        }
        if (memberOrderDTO.getGoodsQuantity()!=null){
            BigDecimal pice=order.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
@@ -598,6 +747,7 @@
                        pice=pice.subtract(data.getReductionAmount());
                        order.setDiscountMoney(data.getReductionAmount());
                    }else{
                        order.setDiscountMoney(pice);
                        pice=new BigDecimal(0);

                    }
@@ -605,31 +755,45 @@
                if (data.getCouponType().getCode()==2){
                    pice= order.getTotalAmount();
                    if(pice.compareTo(data.getVoucherAmount())<0){
                        throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
                        order.setDiscountMoney(pice);
                        pice=new BigDecimal(0);
                    }else{
                        pice=pice.subtract(data.getVoucherAmount());
                        order.setDiscountMoney(data.getVoucherAmount());
                    }
                    pice=pice.subtract(data.getVoucherAmount());
                    order.setDiscountMoney(data.getVoucherAmount());

                }
                if (data.getCouponType().getCode()==3){
                    pice= order.getTotalAmount();
                    BigDecimal pice1=new BigDecimal(data.getDiscountRate());
                    BigDecimal pice2=new BigDecimal(0.1);
                    BigDecimal pice3=pice.multiply(pice1.multiply(pice2));
                    if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
                        pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
                    if (data.getMaxDiscount()!=null){
                        if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
                            pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
                        }
                    }
                    if(pice.compareTo(pice3)<0){
                        throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
                    if(pice.compareTo(pice3)>0){
                        BigDecimal pice4= pice.subtract(pice3);
                        if (data.getMaxDiscount()!=null){
                            if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
                                pice=pice.subtract(data.getMaxDiscount());
                                order.setDiscountMoney(data.getMaxDiscount());
                            }else{
                                order.setDiscountMoney(pice4);
                                pice=pice3;
                            }
                        }else{
                            order.setDiscountMoney(pice.subtract(pice3));
                            pice=pice3;
                        }

                    }else{
                        order.setDiscountMoney(pice);
                        pice=new BigDecimal(0);
                    }

                    BigDecimal pice4= pice.subtract(pice3);
                    if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
                        pice=pice.subtract(data.getMaxDiscount());
                        order.setDiscountMoney(data.getMaxDiscount());
                    }else{
                        order.setDiscountMoney(pice4);
                        pice=pice3;
                    }


                }
                order.setCouponId(memberOrderDTO.getCouponId());
@@ -652,7 +816,7 @@
            CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
            CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();

            if (pice.intValue()>0){
            if (pice.doubleValue()>0){
                BigDecimal divide = pice.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
                BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
                BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
@@ -687,6 +851,16 @@
    }

    @Override
    public void updMemberOrderbz(MemberOrderDTO memberOrderDTO) {
        Order order = baseMapper.selectById(memberOrderDTO.getId());
        if(memberOrderDTO.getOrderRemark()!=null){
            order.setOrderRemark(memberOrderDTO.getOrderRemark());
        }
        baseMapper.updateById(order);

    }

    @Override
    public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {

        Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
@@ -707,20 +881,65 @@
        }
        wrapper.eq(Order::getIsOrder,1);
        wrapper.eq(Order::getDelFlag,0);
        wrapper.orderByDesc(Order::getCancelTime);
        wrapper.orderByDesc(Order::getCreateTime);
        Page<Order> page1 = this.page(page, wrapper);

        PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
        List<MemberOrderListVO> list = memberOrderListVOPageDTO.getList();
        Map<Long, GoodsSku> goodsUnitMap = getGoodsUnitMap(list);
        for (MemberOrderListVO MemberOrderList:list){
            if (MemberOrderList.getOrderStatus().getCode()==1){
                if (MemberOrderList.getOrderFrom().getCode()==1||MemberOrderList.getOrderFrom().getCode()==2||MemberOrderList.getOrderFrom().getCode()==3){
                if (MemberOrderList.getOrderFrom().getCode() == 1
                        || MemberOrderList.getOrderFrom().getCode() == 2
                        || MemberOrderList.getOrderFrom().getCode() == 3
                        || MemberOrderList.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
                    LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
                    if (LocalDateTime.now().isAfter(localDateTime)) {
                        // dateTime1 在 dateTime2 之后
                        MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
                        Order order = this.getOrder(MemberOrderList.getId());
                        order.setOrderStatus(OrderStatusEnum.CANCELED);

                        if (order.getCouponId()!=0){
                            CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                            couponMemberDTO1.setId(order.getCouponId());
                            couponMemberDTO1.setCouponStatus(0);
                            promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
                        }

                        if(order.getOrderNo().contains("SP")){
                            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                            if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                            }

                            goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }

                        if(order.getOrderNo().contains("MS")){
                            GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                            if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                            }
                            goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }
                        // 恢复推荐商品可购数量
                        if (MemberOrderList.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
                            promotionClient.addRecommendAvailableNum(
                                    MemberOrderList.getGoodsQuantity(),
                                    MemberOrderList.getGoodsSkuId(), SecurityConstants.INNER);
                        }

                        this.updateById(order);
                    }

@@ -731,7 +950,8 @@
                    Wrappers.lambdaQuery(OrderReturnRequest.class)
                            .eq(OrderReturnRequest::getOrderId,
                                    MemberOrderList.getId()).last("limit 1"));
            if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
            if (StringUtils.isNotNull(orderReturnRequest)
                    && orderReturnRequest.getStatus() != ReturnRequestStatusEnum.QX) {
                MemberOrderList.setStatus(orderReturnRequest.getStatus());
                MemberOrderList.setRequestId(orderReturnRequest.getId());
                MemberOrderList.setIsRequest(2);
@@ -750,58 +970,185 @@
            }else {
                MemberOrderList.setIsAuctionBond(1);
            }

            CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
            MemberOrderList.setOrderShuoMin(memberPointsPoints.getConfigValue());
            CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
            MemberOrderList.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));

            GoodsSku goodsSku =
                    Objects.nonNull(goodsUnitMap.get(MemberOrderList.getGoodsId()))
                            ? goodsUnitMap.get(MemberOrderList.getGoodsId())
                            : goodsUnitMap.get(MemberOrderList.getGoodsSkuId());
            if (Objects.nonNull(goodsSku)) {
                MemberOrderList.setUnit(goodsSku.getUnit());
                MemberOrderList.setSpec(goodsSku.getSpec());
                MemberOrderList.setSpecUnit(goodsSku.getSpecUnit());
            }
        }


        return memberOrderListVOPageDTO;
    }

    @NotNull
    private Map<Long, GoodsSku> getGoodsUnitMap(List<MemberOrderListVO> list) {
        Map<Long, GoodsSku> goodsSkuMap = new HashedMap();
        Set<Long> goodsSkuIdSet = list.stream()
                .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER))
                .map(MemberOrderListVO::getGoodsSkuId)
                .collect(Collectors.toSet());
        if (CollUtils.isNotEmpty(goodsSkuIdSet)) {
            goodsSkuMap = goodsSkuClient.getGoodsListByIds(goodsSkuIdSet,
                            SecurityConstants.INNER).getData().stream()
                    .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
        }
        Set<Long> seckillIdSet = list.stream()
                .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS))
                .map(MemberOrderListVO::getGoodsSkuId)
                .collect(Collectors.toSet());

        if (CollUtils.isNotEmpty(seckillIdSet)) {
            Map<Long, GoodsSku> goodsSkuMap2 = goodsSkuClient.getGoodsSkuBySeckillIdSet(
                            seckillIdSet,
                            SecurityConstants.INNER).getData().stream()
                    .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
            // 将goodsSkuMap2合并到goodsSkuMap中
            goodsSkuMap.putAll(goodsSkuMap2);
        }
        Set<Long> groupPurchaseIdSet = list.stream()
                .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS))
                .map(MemberOrderListVO::getGoodsSkuId)
                .collect(Collectors.toSet());
        if (CollUtils.isNotEmpty(groupPurchaseIdSet)) {
            Map<Long, GoodsSku> goodsSkuMap3 = goodsSkuClient.getGoodsSkuByGroupPurchaseIdSet(
                            groupPurchaseIdSet,
                            SecurityConstants.INNER).getData().stream()
                    .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
            goodsSkuMap.putAll(goodsSkuMap3);
        }
        Set<Long> auctionGoodsIdSet = list.stream()
                .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)
                        && vo.getAuctionOrderType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS))
                .map(MemberOrderListVO::getGoodsSkuId)
                .collect(Collectors.toSet());
        if (CollUtils.isNotEmpty(auctionGoodsIdSet)) {
            Map<Long, GoodsSku> goodsSkuMap4 = auctionClient.getGoodsSkuByAuctionGoodsIdSet(
                            auctionGoodsIdSet,
                            SecurityConstants.INNER).getData().stream()
                    .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
            goodsSkuMap.putAll(goodsSkuMap4);
        }
        Set<Long> auctionSalesroomGoodsSet = list.stream()
                .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)
                        && vo.getAuctionOrderType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS))
                .map(MemberOrderListVO::getGoodsSkuId)
                .collect(Collectors.toSet());
        if (CollUtils.isNotEmpty(auctionSalesroomGoodsSet)) {
            Map<Long, GoodsSku> goodsSkuMap5 = auctionClient.getGoodsSkuByAuctionSalesroomGoodsSet(
                            auctionSalesroomGoodsSet,
                            SecurityConstants.INNER).getData().stream()
                    .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
            goodsSkuMap.putAll(goodsSkuMap5);
        }
        return goodsSkuMap;
    }

    @Override
    public OrderVO MemberOrderOne(MemberOrderListDTO memberOrderListDTO) {
        Order order = baseMapper.selectById(memberOrderListDTO.getId());
        OrderVO orderVO=new OrderVO();
        try {
            orderVO = BeanUtils.copyBean(order, OrderVO.class);
            if (orderVO.getOrderFrom().getCode()==3){
                GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                orderVO.setGroupTime(data.getGroupTime());
                orderVO.setSkuId(data.getGoodsSkuId());
            }
        orderVO = BeanUtils.copyBean(order, OrderVO.class);
        orderVO.setAuctionType(order.getAuctionOrderType());
        orderVO.setCouponId(order.getCouponId());
        orderVO.setBound(order.getBound());
        orderVO.setIsRequest(order.getIsRequest());
        if (orderVO.getOrderFrom().getCode() == 3) {
            GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(
                    order.getGoodsSkuId(), SecurityConstants.INNER).getData();
            orderVO.setGroupTime(data.getGroupTime());
            orderVO.setSkuId(data.getGoodsSkuId());
        }

            OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
                    Wrappers.lambdaQuery(OrderReturnRequest.class)
                            .eq(OrderReturnRequest::getOrderId,
                                    orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
                                    0).last("limit 1"));
            if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
                orderVO.setStatus(orderReturnRequest.getStatus());
                orderVO.setRequestId(orderReturnRequest.getId());
                orderVO.setIsRequest(2);
            }else{
                orderVO.setIsRequest(1);
            }

            LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
            wrapper3.eq(OrderAuctionBond::getOrderId,order.getId());
            OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
            if (orderAuctionBond!=null){
                if (orderAuctionBond.getBoundStatus().getCode()==1||orderAuctionBond.getBoundStatus().getCode()==2){
                    orderVO.setIsAuctionBond(1);
                }else{
                    orderVO.setIsAuctionBond(2);
                }
            }else {
        LambdaQueryWrapper<OrderAuctionBond> wrapper3 = Wrappers.lambdaQuery();
        wrapper3.eq(OrderAuctionBond::getOrderId, order.getId());
        OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
        if (orderAuctionBond != null) {
            if (orderAuctionBond.getBoundStatus().getCode() == 1
                    || orderAuctionBond.getBoundStatus().getCode() == 2) {
                orderVO.setIsAuctionBond(1);
            } else {
                orderVO.setIsAuctionBond(2);
            }

        } catch (Exception e) {
            throw new RuntimeException(e);
        } else {
            orderVO.setIsAuctionBond(1);
        }
        if (order.getTotalAmount()==null){
            order.setTotalAmount(new BigDecimal(0));
        }
        GoodsSku goodsSku = getGoodsSku(orderVO);
        if (Objects.nonNull(goodsSku)) {
            orderVO.setUnit(goodsSku.getUnit());
            orderVO.setSpec(goodsSku.getSpec());
            orderVO.setSpecUnit(goodsSku.getSpecUnit());
        }
        CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
        orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
        CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
        orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
        // 查询售后记录
        Optional<OrderReturnRequest> orderReturnRequestOpt = orderReturnRequestService.lambdaQuery()
                .eq(OrderReturnRequest::getOrderId, order.getId()).oneOpt();
        if (orderReturnRequestOpt.isPresent()) {
            OrderReturnRequest orderReturnRequest = orderReturnRequestOpt.get();
            orderVO.setStatus(orderReturnRequest.getStatus());
        }
        return orderVO;
    }

    private GoodsSku getGoodsSku(OrderVO orderVO) {
        GoodsSku goodsSku = null;
        switch (orderVO.getOrderFrom()) {
            case COMMODITY_ORDER:
                goodsSku = goodsSkuClient.getGoodsSkuOne(orderVO.getGoodsSkuId(),
                        SecurityConstants.INNER).getData();
                break;
            case SNAP_ORDERS:
                List<GoodsSku> skuList = goodsSkuClient.getGoodsSkuBySeckillIdSet(
                        Sets.newHashSet(orderVO.getGoodsSkuId()),
                        SecurityConstants.INNER).getData();
                if (CollUtils.isNotEmpty(skuList)) {
                    goodsSku = skuList.get(0);
                }
                break;
            case GROUP_PURCHASE_ORDERS:
                List<GoodsSku> data = goodsSkuClient.getGoodsSkuByGroupPurchaseIdSet(
                        Sets.newHashSet(orderVO.getGoodsSkuId()),
                        SecurityConstants.INNER).getData();
                if (CollUtils.isNotEmpty(data)) {
                    goodsSku = data.get(0);
                }
                break;
            case AUCTION_ORDERS:
                List<GoodsSku> goodsSkuList;
                if (orderVO.getAuctionType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS)) {
                    goodsSkuList = auctionClient.getGoodsSkuByAuctionGoodsIdSet(
                            Sets.newHashSet(orderVO.getGoodsSkuId()),
                            SecurityConstants.INNER).getData();
                    if (CollUtils.isNotEmpty(goodsSkuList)) {
                        goodsSku = goodsSkuList.get(0);
                    }
                } else {
                    goodsSkuList = auctionClient.getGoodsSkuByAuctionSalesroomGoodsSet(
                            Sets.newHashSet(orderVO.getGoodsSkuId()),
                            SecurityConstants.INNER).getData();
                }
                if (CollUtils.isNotEmpty(goodsSkuList)) {
                    goodsSku = goodsSkuList.get(0);
                }
                break;
        }
        return goodsSku;
    }

    @Override
@@ -844,10 +1191,31 @@
                    goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                }
                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
                if (data.getStartStatus().equals(StartStatusEnum.ENDED)) {
                    GoodsStockUpdDTO dto = new GoodsStockUpdDTO();
                    dto.setGoodsSkuId(data.getGoodsSkuId());
                    dto.setAuctionStock(order.getGoodsQuantity());
                    goodsSkuClient.updGoodsStock(Lists.newArrayList(dto), SecurityConstants.INNER);
                }
            }


            if(order.getOrderNo().contains("TG")){
                GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
                goodsGroupPurchaseInfo.setGroupPurchaseId(order.getGoodsSkuId());
                goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
                GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                    goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
                    GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

                }
            }
            // 恢复可购数量
            if (order.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
                promotionClient.addRecommendAvailableNum(
                        order.getGoodsQuantity(), order.getGoodsSkuId(), SecurityConstants.INNER);
            }

        }
        if (order.getOrderStatus().getCode() == 2) {
@@ -881,6 +1249,21 @@
                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
            }

            if(order.getOrderNo().contains("TG")){
                GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
                goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
                GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                    goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
                    GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

                }
            }
            // 恢复可购数量
            if (order.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
                promotionClient.addRecommendAvailableNum(
                        order.getGoodsQuantity(), order.getGoodsSkuId(), SecurityConstants.INNER);
            }
            if (order.getCouponId()!=0){
                CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                couponMemberDTO1.setId(order.getCouponId());
@@ -896,6 +1279,12 @@
            MembeOneDTO.setTotalPoints(order.getPoints());
            memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);

            MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
            memberPointsDTO.setMemberId(order.getMemberId());
            memberPointsDTO.setPointsType(2);
            memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
            memberPointsDTO.setPoints(order.getPoints());
            memberClient.addMemberPoints(memberPointsDTO);

            if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//支付宝
                //获取支付信息
@@ -933,6 +1322,9 @@
                }
            }
        }
        if (order.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)) {
            refundBond(order);
        }
    }

    @Override
@@ -940,13 +1332,11 @@

         Order byId = this.getById(memberOrderListDTO.getId());

        if(byId.getOrderNo().contains("TG")){
            GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
            goodsGroupPurchaseInfo.setGroupPurchaseId(byId.getGoodsSkuId());
            goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
            GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
        if (byId.getOrderNo().contains("TG") && StringUtils.isNotBlank(byId.getGroupNo())) {
            GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId.getGroupNo(), SecurityConstants.INNER).getData();
            if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                GoodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
                goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(byId.getGoodsQuantity());
                GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

            }
        }
@@ -1008,48 +1398,64 @@
            order.setReceiveTime(LocalDateTime.now());
            baseMapper.updateById(order);

            LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
            OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
            if(orderAuctionBond!=null){
                if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
                    //获取支付信息
                    LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                    paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
                    Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
                    boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
                    if (!bo) {
                        System.out.println("支付宝退款失败");
                    }
                } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
                    //获取支付信息
                    LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                    paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
                    Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
            if (order.getAuctionOrderType().getCode()==1){

                    String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                    Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
                    String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                    Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
                    refundFee = 1;
            }else{

                    String regEx = "[^0-9]";
                    Pattern p = Pattern.compile(regEx);
                    Matcher m = p.matcher(order.getOrderNo());
                    String ma = m.replaceAll("").trim();
                    boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
                    if (!bo) {
                        System.out.println("微信退款失败");
                    }
                }
            }



        }else{
            refundBond(order);
        } else {
            order.setOrderStatus(OrderStatusEnum.FINISHED);
            order.setReceiveTime(LocalDateTime.now());
            baseMapper.updateById(order);
        }
    }

    private void refundBond(Order order) {
        LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(order.getAuctionOrderType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS),
                OrderAuctionBond::getAuctionSalesroomId, order.getAuctionSalesroomId());
        wrapper.eq(order.getAuctionOrderType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS),
                OrderAuctionBond::getAuctionGoodsId, order.getGoodsSkuId());
        wrapper.eq(OrderAuctionBond::getMemberId, order.getMemberId());
        wrapper.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID);
        OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
        if (orderAuctionBond != null && orderAuctionBond.getBond() != null) {
            if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {// 支付宝
                // 获取支付信息
                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
                Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
                boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(),
                        paylog.getTradeNo(), paylog.getPayMoney());
                if (!bo) {
                    System.out.println("支付宝退款失败");
                } else {
                    orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
                }
            } else if (order.getPaymentMethod() != null
                    && order.getPaymentMethod().getCode() == 1) {// 微信
                // 获取支付信息
                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
                Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);

                String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer refundFee = Integer.parseInt(
                        refundMoney.substring(0, refundMoney.length() - 3));
                String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
                refundFee = 1;
                String refundNo = OrderUtil.getOrderNoForPrefix("R");
                boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(),
                        paylog.getOutTradeNo(), refundNo, totalFee, refundFee, "2");
                if (!bo) {
                    System.out.println("微信退款失败");
                } else {
                    orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
                }
            }
            orderAuctionBondMapper.updateById(orderAuctionBond);
        }
    }

@@ -1072,6 +1478,47 @@
                        Order order = this.getById(MemberOrderList.getId());
                        order.setOrderStatus(OrderStatusEnum.CANCELED);
                        this.updateById(order);


                        if (order.getCouponId()!=0){
                            CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                            couponMemberDTO1.setId(order.getCouponId());
                            couponMemberDTO1.setCouponStatus(0);
                            promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
                        }

                        if(order.getOrderNo().contains("SP")){
                            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            if (Objects.nonNull(goodsSku)) {
                                GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                                goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                                goodsStockUpdDTO1.setAuctionStock(
                                        goodsSku.getStock() + order.getGoodsQuantity());
                                if (goodsSku.getSoldQuantity() - order.getGoodsQuantity() < 0) {
                                    goodsStockUpdDTO1.setSoldQuantity(0);
                                } else {
                                    goodsStockUpdDTO1.setSoldQuantity(
                                            goodsSku.getSoldQuantity() - order.getGoodsQuantity());
                                }

                                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,
                                        SecurityConstants.INNER);
                            }
                        }

                        if(order.getOrderNo().contains("MS")){
                            GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                            if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                            }
                            goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }

                    }

                }
@@ -1085,6 +1532,7 @@
        paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper.eq(Order::getOrderStatus,1);
        paylogEntityWrapper.eq(Order::getDelFlag,0);
        paylogEntityWrapper.eq(Order::getIsOrder,1);
        List<Order> list = this.list(paylogEntityWrapper);
        vo.setDzforderNo(list.size());

@@ -1092,6 +1540,7 @@
        paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper1.eq(Order::getOrderStatus,2);
        paylogEntityWrapper1.eq(Order::getDelFlag,0);
        paylogEntityWrapper1.eq(Order::getIsOrder,1);
        List<Order> list1 = this.list(paylogEntityWrapper1);
        vo.setDfhorderNo(list1.size());

@@ -1099,6 +1548,7 @@
        paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper2.eq(Order::getOrderStatus,3);
        paylogEntityWrapper2.eq(Order::getDelFlag,0);
        paylogEntityWrapper2.eq(Order::getIsOrder,1);
        List<Order> list2 = this.list(paylogEntityWrapper2);
        vo.setDshorderNo(list2.size());

@@ -1108,9 +1558,83 @@
        paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper3.eq(Order::getIsRequest,2);
        paylogEntityWrapper3.eq(Order::getDelFlag,0);
        paylogEntityWrapper3.eq(Order::getIsOrder,1);
        List<Order> list3 = this.list(paylogEntityWrapper3);
        vo.setShorderNo(list3.size());
        return vo;
    }

    @Override
    public PageDTO<WdOrderVO> CtjlGoodsGroupPurchase(HomeGoodsSkuDTO1 homeGoodsSkuDTO1) {
        LambdaQueryWrapper< Order> wrapper1= Wrappers.lambdaQuery();
        if (homeGoodsSkuDTO1.getSkuName()!=null&&homeGoodsSkuDTO1.getSkuName()!=""){
            wrapper1.like(Order::getSkuName,homeGoodsSkuDTO1.getSkuName());
        }
        wrapper1.eq(Order::getMemberId,homeGoodsSkuDTO1.getMemberId());
        wrapper1.eq(Order::getOrderFrom,3);
        wrapper1.eq(Order::getDelFlag,0);
        wrapper1.orderByDesc(Order::getCreateTime);
        Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
        Page< Order> page1 = this.page(page, wrapper1);
        PageDTO<WdOrderVO> HomeGoodsSeckillVOPageDTO = PageDTO.of(page1, WdOrderVO.class);
        List<WdOrderVO> list2 = HomeGoodsSeckillVOPageDTO.getList();

        for (WdOrderVO goodsGroupPurchaseeVO1:list2) {

            Order byId1 = this.getById(goodsGroupPurchaseeVO1.getId());

            GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (Objects.nonNull(data)) {
                BeanUtils.copyProperties(data, goodsGroupPurchaseeVO1);
                GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(),
                        SecurityConstants.INNER).getData();
                goodsGroupPurchaseeVO1.setGoodsSkuName(byId.getSkuName());
                goodsGroupPurchaseeVO1.setCoverPic(byId.getCoverPic());
                goodsGroupPurchaseeVO1.setPrice(byId.getPrice());
                goodsGroupPurchaseeVO1.setYears(String.valueOf(byId.getYears().getYear()));
                goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
                if (byId1.getGroupNo() != null) {
                    GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(
                            byId1.getGroupNo(), SecurityConstants.INNER).getData();
                    if (one1 != null) {
                        goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
                        if (one1.getGroupStatus() == 0) {
                            if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
                                goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
                            } else {
                                goodsGroupPurchaseeVO1.setGroupStatus(
                                        GroupStatusEnum.TO_FORM_A_GROUP);
                            }
                        }
                        if (one1.getGroupStatus() == 1) {
                            goodsGroupPurchaseeVO1.setGroupStatus(
                                    GroupStatusEnum.FORMED_INTO_A_GROUP);
                        }
                        if (one1.getGroupStatus() == 2) {
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                        }
                    } else {
                        if (data.getGroupStatus().getCode() == 1) {
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
                        }
                        if (data.getGroupStatus().getCode() == 2) {
                            goodsGroupPurchaseeVO1.setGroupStatus(
                                    GroupStatusEnum.FORMED_INTO_A_GROUP);
                        }
                        if (data.getGroupStatus().getCode() == 3) {
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                        }
                    }

                }

            }


        }


        return HomeGoodsSeckillVOPageDTO;
    }

    /**
@@ -1122,7 +1646,8 @@
    @Override
    public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
        return this.lambdaQuery().in(Order::getCouponId, couponIds)
                .eq(Order::getOrderStatus, OrderStatusEnum.FINISHED).list();
                .ne(Order::getOrderStatus, OrderStatusEnum.CANCELED).eq(Order::getIsRequest, 1)
                .list();
    }

    /**
@@ -1171,77 +1696,121 @@
                        query.getSkuName())
                .eq(StringUtils.isNotNull(query.getOrderStatus()), Order::getOrderStatus,
                        query.getOrderStatus())
                .eq(StringUtils.isNotNull(query.getOrderStatus()) && query.getOrderStatus()
                        .equals(OrderStatusEnum.FINISHED), Order::getIsRequest, 1)
                .orderByDesc(Order::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            pageVO = PageDTO.empty(page);
        }
        pageVO = PageDTO.of(page, MgtOrderVO.class);
        if (query.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
            List<MgtOrderVO> list = pageVO.getList();
        List<MgtOrderVO> voList = pageVO.getList();
        List<Long> orderIdList = voList.stream().filter(order -> order.getIsRequest().equals(2))
                .map(MgtOrderVO::getId).collect(
                        Collectors.toList());
        if (CollUtils.isNotEmpty(orderIdList)) {
            List<OrderReturnRequest> orderReturnRequestList = orderReturnRequestService.lambdaQuery()
                    .in(OrderReturnRequest::getOrderId, orderIdList)
                    .eq(OrderReturnRequest::getStatus, ReturnRequestStatusEnum.COMPLETED)
                    .eq(OrderReturnRequest::getAuditStatus, AuditStatusEnum.PASSED).list();
            List<Long> orderReturnRequestPassedIds = orderReturnRequestList.stream()
                    .map(OrderReturnRequest::getOrderId)
                    .collect(Collectors.toList());
            for (MgtOrderVO order : voList) {
                if (orderReturnRequestPassedIds.contains(order.getId())) {
                    order.setIsRequest(3);
                }
            }
        }
        if (query.getQueryType() == OrderTypeEnum.AUCTION_ORDER) {
            List<MgtOrderVO> list = voList;
            // 封装参数查询拍卖会
            Set<Long> auctionSalesroomGoodsIdSet = list.stream()
                    .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
                    .filter(order -> order.getAuctionOrderType()
                            == AuctionOrderTypeEnum.AUCTION_ITEMS)
                    .map(MgtOrderVO::getGoodsSkuId).collect(Collectors.toSet());
            List<AuctionSalesroom> auctionSalesroomList = auctionClient.getAuctionSalesroomByIds(
                            auctionSalesroomGoodsIdSet, SecurityConstants.INNER)
                    .getData();
            Map<Long, String> salesroomMap = auctionSalesroomList.stream()
                    .collect(Collectors.toMap(AuctionSalesroom::getId,
                            AuctionSalesroom::getSalesroomName));
            Map<Long, String> salesroomMap = new HashedMap();
            Set<Long> auctionSalesroomSet = new HashSet<>();
            if (CollUtils.isNotEmpty(auctionSalesroomList)) {
                salesroomMap = auctionSalesroomList.stream()
                        .collect(Collectors.toMap(AuctionSalesroom::getId,
                                AuctionSalesroom::getSalesroomName));
            }
            // 封装参数查询拍卖订单保证金
            Set<Long> auctionGoodsIdSet = list.stream()
                    .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
                    .filter(order -> order.getAuctionOrderType()
                            == AuctionOrderTypeEnum.REGULAR_ITEMS)
                    .map(MgtOrderVO::getGoodsSkuId)
                    .collect(Collectors.toSet());

            Set<Long> auctionSalesroomSet = auctionSalesroomList.stream()
                    .map(AuctionSalesroom::getId)
                    .collect(Collectors.toSet());

            List<OrderAuctionBond> auctionBondList = orderAuctionBondMapper.selectList(
            List<OrderAuctionBond> auctionSalesroomBondList = orderAuctionBondMapper.selectList(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .in(OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
                            .in(OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
                            .in(CollUtils.isNotEmpty(auctionSalesroomSet),
                                    OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID)
                            .groupBy(OrderAuctionBond::getAuctionSalesroomId,
                                    OrderAuctionBond::getMemberId));
            List<OrderAuctionBond> auctionGoodsBondList = orderAuctionBondMapper.selectList(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .in(CollUtils.isNotEmpty(auctionGoodsIdSet),
                                    OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
                            .eq(OrderAuctionBond::getBoundStatus,
                                    BondStatusEnum.PAID));
            Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionBondList.stream()
                                    BondStatusEnum.PAID)
                            .groupBy(OrderAuctionBond::getAuctionGoodsId,
                                    OrderAuctionBond::getMemberId));
            Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionSalesroomBondList.stream()
                    .filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
                    .collect(Collectors.toMap(
                            bond -> bond.getAuctionSalesroomId() + "-" + bond.getMemberId(),
                            Function.identity()));
            Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionBondList.stream()
            Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionGoodsBondList.stream()
                    .filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
                    .collect(Collectors.toMap(
                            bond -> bond.getAuctionGoodsId() + "-" + bond.getMemberId(),
                            Function.identity()));

            list.forEach(order -> {
                if (order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
            for (MgtOrderVO order : list) {
                if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
                    order.setSalesroomName(
                            StringUtils.isNotBlank(salesroomMap.get(order.getGoodsSkuId()))
                            StringUtils.isNotBlank(salesroomMap.get(order.getAuctionSalesroomId()))
                                    ? salesroomMap.get(order.getAuctionSalesroomId()) : "无");
                    order.setBoundStatus(
                            StringUtils.isNotNull(auctionSalesroomBondMap.get(
                                            order.getAuctionSalesroomId() + "-" + order.getMemberId())
                                    .getBoundStatus())
                                    order.getAuctionSalesroomId() + "-" + order.getMemberId()))
                                    ? auctionSalesroomBondMap.get(
                                            order.getAuctionSalesroomId() + "-" + order.getMemberId())
                                    .getBoundStatus()
                                    : null);
                }
                if (order.getAuctionType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
                if (order.getAuctionOrderType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
                    order.setSalesroomName("无");
                    order.setBoundStatus(
                            StringUtils.isNotNull(auctionSalesroomGoodsBondMap.get(
                                            order.getGoodsSkuId() + "-" + order.getMemberId())
                                    .getBoundStatus())
                                    order.getGoodsSkuId() + "-" + order.getMemberId()))
                                    ? auctionSalesroomGoodsBondMap.get(
                                            order.getGoodsSkuId() + "-" + order.getMemberId())
                                    .getBoundStatus()
                                    : null);
                }
            });
            }

        }
        Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)
                .collect(Collectors.toSet());
        List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)
                .getData();
        if (CollUtils.isNotEmpty(data)) {
            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 +1843,7 @@
            }
        }
        // 查询售后信息
        if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
        if (order.getIsRequest() == 2) {
            OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
                    Wrappers.lambdaQuery(OrderReturnRequest.class)
                            .eq(OrderReturnRequest::getOrderId,
@@ -1336,6 +1905,10 @@
            order.setOrderStatus(OrderStatusEnum.FINISHED);
            order.setReceiveTime(LocalDateTime.now());
            this.updateById(order);
            // 拍卖订单退保证金
            if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
                refundBond(id);
            }
        }
    }

@@ -1345,27 +1918,60 @@
     * @param id 订单id
     */
    @Override
    @GlobalTransactional(rollbackFor = Exception.class)
    @Transactional
    public void refund(Long id) {
        Order order = getOrder(id);
        if (order.getIsRequest() == 2) {
            throw new ServiceException("该订单已是售后状态");
        }
        String orderNo = order.getOrderNo();
        Paylog paylog = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
                .last("limit 1").one();
        Optional<Paylog> paylogOpt = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
                .last("limit 1").oneOpt();
        PaymentMethodEnum paymentMethod = order.getPaymentMethod();

        if (StringUtils.isNotNull(paylog)) {
        if (paylogOpt.isPresent()) {
            Paylog paylog = paylogOpt.get();
            boolean result = handleRefund(paymentMethod, paylog, orderNo);
            if (result) {
                paylog.setState(3);// 已退款
                iPaylogService.updateById(paylog);
            }
            OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
            orderReturnRequest.setOrderId(id);
            orderReturnRequest.setRequestTime(LocalDateTime.now());
            orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
            orderReturnRequest.setRequestReason("管理后台退款");
            orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
            orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
            orderReturnRequestService.save(orderReturnRequest);
        }
        order.setIsRequest(2);
        this.updateById(order);
        // 生成售后记录
        OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
        orderReturnRequest.setOrderId(id);
        orderReturnRequest.setRequestTime(LocalDateTime.now());
        orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
        orderReturnRequest.setRequestReason("管理后台退款");
        orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
        orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
        orderReturnRequest.setAuditTime(LocalDateTime.now());
        orderReturnRequestService.save(orderReturnRequest);
        // 扣除订单积分
        Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
                .getData();
        if (StringUtils.isNotNull(member)) {
            MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
            memberPointsDTO.setMemberId(order.getMemberId());
            memberPointsDTO.setPointsType(2);
            memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
            memberPointsDTO.setPoints(order.getPoints());
            memberClient.addMemberPoints(memberPointsDTO);

            updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
            updMembeOneDTO.setMemberId(order.getMemberId());
            updMembeOneDTO.setType(2);
            updMembeOneDTO.setTotalPoints(Math.max(member.getTotalPoints() - order.getPoints(), 0));
            memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
        }
        if (Objects.nonNull(order.getCouponId())) {
            CouponMemberDTO dto = new CouponMemberDTO();
            dto.setId(order.getCouponId());
            dto.setCouponStatus(CouponUseEnum.UNUSED.getCode());
            promotionClient.updCouponMember(dto, SecurityConstants.INNER);
        }
    }

@@ -1377,12 +1983,9 @@
                    refundMoney.substring(0, refundMoney.length() - 3));
            String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100D);
            Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
            String regEx = "[^0-9]";
            Pattern p = Pattern.compile(regEx);
            Matcher m = p.matcher(orderNo);
            String ma = m.replaceAll("").trim();
            String refundNo = OrderUtil.getOrderNoForPrefix("R");
            result = paylogService.refundForWxpay(2, paylog.getTradeNo(),
                    paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "4");
                    paylog.getOutTradeNo(), refundNo, totalFee, refundFee, "4");
        } else if (paymentMethod == PaymentMethodEnum.ALIPAY) {
            result = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(),
                    paylog.getPayMoney());
@@ -1399,9 +2002,12 @@
    @Override
    public void refundReturn(Long id) {
        Order order = getOrder(id);
        if (order.getIsRequest() == 2) {
            throw new ServiceException("该订单已是售后状态");
        }
        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)) {
@@ -1416,6 +2022,7 @@
            orderReturnRequest.setRequestReason("管理后台退款退货");
            orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_RETURNED);
            orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
            orderReturnRequest.setAuditTime(LocalDateTime.now());
            orderReturnRequestService.save(orderReturnRequest);
        }

@@ -1443,33 +2050,32 @@
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .eq(OrderAuctionBond::getAuctionSalesroomId,
                                    order.getAuctionSalesroomId())
                            .eq(OrderAuctionBond::getMemberId, order.getMemberId())
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
            if (StringUtils.isNotNull(orderAuctionBond)
                    && orderAuctionBond.getBoundStatus() == BondStatusEnum.REFUNDED) {
                throw new ServiceException("改拍卖会已退保证金");
            }
        } else {
            orderAuctionBond = orderAuctionBondMapper.selectOne(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .eq(OrderAuctionBond::getAuctionGoodsId,
                                    order.getGoodsSkuId())
                            .eq(OrderAuctionBond::getMemberId, order.getMemberId())
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
        }
        Paylog paylog = iPaylogService.lambdaQuery()
                .eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
                .last("limit 1").one();
        if (StringUtils.isNull(paylog)) {
            throw new ServiceException("支付记录不存在");
        }
        PaymentMethodEnum paymentMethod = orderAuctionBond.getPaymentMethod();
        if (orderAuctionBond.getBoundStatus() == BondStatusEnum.PAID) {
            boolean result = handleRefund(paymentMethod, paylog, orderAuctionBond.getOrderNo());
            if (result) {
                paylog.setState(3);// 已退款
                orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
                iPaylogService.updateById(paylog);
                this.updateById(order);
        if (StringUtils.isNotNull(orderAuctionBond)) {
            Optional<Paylog> paylogOpt = iPaylogService.lambdaQuery()
                    .in(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
                    .oneOpt();
            if (paylogOpt.isPresent()) {
                Paylog paylog = paylogOpt.get();
                boolean result = handleRefund(orderAuctionBond.getPaymentMethod(), paylog,
                        orderAuctionBond.getOrderNo());
                if (result) {
                    paylog.setState(3);// 已退款
                    orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
                    iPaylogService.updateById(paylog);
                    orderAuctionBondMapper.updateById(orderAuctionBond);
                }
            }

        }
    }

@@ -1484,4 +2090,61 @@
    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();
    }


    @Override
    public void updateOrderStatusByMubres1(String formedGroupMubres) {

        LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(Order::getGroupNo, formedGroupMubres);
        List<Order> page1 = this.list(wrapper);
        log.info("开始更新订单，已成团的团购订单：{}", page1);
        for (Order p:page1){
            p.setIsOrder(1);
            this.updateById(p);
        }

    }

    @Override
    public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) {
        LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(Order::getGroupNo, formedGroupMubres);
        List<Order> page1 = this.list(wrapper);
        return page1;
    }

    /**
     * 根据skuId获取心愿求购详情数据
     *
     * @param id
     * @return
     */
    @Override
    public MgtPromotionWishRecommendVO getWishDataBySkuId(Long id) {
        MgtPromotionWishRecommendVO vo = null;
        List<Order> list = this.lambdaQuery().eq(Order::getGoodsSkuId, id)
                .eq(Order::getOrderFrom, OrderFromEnum.WISH_ORDER)
                .ne(Order::getOrderStatus, OrderStatusEnum.CANCELED).list();
        if (CollUtils.isNotEmpty(list)) {
            vo = new MgtPromotionWishRecommendVO();
            Integer purchasedNum = list.stream().map(Order::getGoodsQuantity)
                    .reduce(0, Integer::sum);
            String orderNo = list.stream().map(Order::getOrderNo).collect(Collectors.joining(","));
            vo.setPurchasedNum(purchasedNum);
            vo.setOrderNo(orderNo);
        }
        return vo;
    }
}