修改bug

mitao

2024-08-14 07057a9a0c8624ec1876670e69b0631b1213793f

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

@@ -1,5 +1,7 @@
package com.ruoyi.order.service.impl;

import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +12,8 @@
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;
@@ -37,6 +41,8 @@
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.AuctionSalesroom;
import com.ruoyi.system.api.domain.CouponMember;
@@ -79,6 +85,8 @@
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;
@@ -167,6 +175,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());
@@ -188,6 +199,8 @@
        order.setOrderTimeSx(OrderDTO.getOrderTimeSx());
        this.save(order);



        if (OrderDTO.getOrderFrom().getCode()==4){
            if (OrderDTO.getAuctionType().getCode()==1){
                LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
@@ -202,7 +215,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);
@@ -238,7 +250,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);
@@ -266,8 +278,18 @@
    }

    @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
@@ -344,6 +366,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;
@@ -395,10 +418,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());
@@ -475,6 +517,9 @@
        return memberOrderVO;
    }

    public static void main(String[] args) {
        System.err.println(DateUtil.format(LocalDateTime.now(), DatePattern.NORM_DATETIME_PATTERN));
    }
    @Override
    public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
        Order order = baseMapper.selectById(memberOrderDTO.getId());
@@ -521,25 +566,21 @@
            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!=order.getGoodsQuantity()){
                    if (num!=null){
                        num1 =num+order.getGoodsQuantity();
                        num1 =num+memberOrderDTO.getGoodsQuantity();
                    }else{
                        num1=order.getGoodsQuantity();
                    }
                }else{
                      num1=num;
                }


                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()!=0||data.getLimitNumber()<num1){

                    if (data.getLimitNumber()<num1){
                        throw new ServiceException("对不起，大于商品购买数");
                    }else{

@@ -574,7 +615,7 @@
                    memberOrderVO.setSkuName(goodsSku.getSkuName());
                    memberOrderVO.setYouhiPrice(data.getSeckillPrice());

                }


        }  if (order.getOrderFrom().getCode()==3){
                order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
@@ -697,7 +738,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()));
@@ -732,6 +773,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());
@@ -752,7 +803,7 @@
        }
        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);
@@ -772,9 +823,34 @@
                            couponMemberDTO1.setId(order.getCouponId());
                            couponMemberDTO1.setCouponStatus(0);
                            promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
                            order.setCouponId(0L);
                        }

                        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);
                        }


                        this.updateById(order);
@@ -787,7 +863,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);
@@ -823,23 +900,14 @@
        OrderVO orderVO=new OrderVO();
        try {
            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();
@@ -853,7 +921,6 @@
                }
            }else {
                orderVO.setIsAuctionBond(1);
                orderVO.setBound(new BigDecimal(0));
            }

        } catch (Exception e) {
@@ -866,6 +933,13 @@
        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;
    }

@@ -912,7 +986,17 @@
            }


            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.getOrderStatus().getCode() == 2) {
@@ -946,6 +1030,17 @@
                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.getCouponId()!=0){
                CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                couponMemberDTO1.setId(order.getCouponId());
@@ -961,6 +1056,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) {//支付宝
                //获取支付信息
@@ -998,6 +1099,9 @@
                }
            }
        }
        if (order.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)) {
            refundBond(order);
        }
    }

    @Override
@@ -1006,12 +1110,10 @@
         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();
            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);

            }
        }
@@ -1073,48 +1175,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);
        }
    }

@@ -1137,6 +1255,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);
                        }

                    }

                }
@@ -1150,6 +1309,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());

@@ -1157,6 +1317,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());

@@ -1164,6 +1325,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());

@@ -1173,9 +1335,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;
    }

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

    /**
@@ -1235,6 +1473,8 @@
                        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())) {
@@ -1242,6 +1482,23 @@
        }
        pageVO = PageDTO.of(page, MgtOrderVO.class);
        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;
            // 封装参数查询拍卖会
@@ -1258,9 +1515,6 @@
                salesroomMap = auctionSalesroomList.stream()
                        .collect(Collectors.toMap(AuctionSalesroom::getId,
                                AuctionSalesroom::getSalesroomName));
                auctionSalesroomList.stream()
                        .map(AuctionSalesroom::getId)
                        .collect(Collectors.toSet());
            }
            // 封装参数查询拍卖订单保证金
            Set<Long> auctionGoodsIdSet = list.stream()
@@ -1428,6 +1682,10 @@
            order.setOrderStatus(OrderStatusEnum.FINISHED);
            order.setReceiveTime(LocalDateTime.now());
            this.updateById(order);
            // 拍卖订单退保证金
            if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
                refundBond(id);
            }
        }
    }

@@ -1445,36 +1703,38 @@
            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);
            orderReturnRequest.setAuditTime(LocalDateTime.now());
            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(1);
            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
            memberPointsDTO.setPointsType(2);
            memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
            memberPointsDTO.setPoints(order.getPoints());
            memberClient.addMemberPoints(memberPointsDTO);

@@ -1483,6 +1743,12 @@
            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);
        }
    }

@@ -1494,12 +1760,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());
@@ -1562,30 +1825,34 @@
        if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
            orderAuctionBond = orderAuctionBondMapper.selectOne(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .eq(OrderAuctionBond::getOrderId, id)
                            .eq(OrderAuctionBond::getAuctionSalesroomId,
                                    order.getAuctionSalesroomId())
                            .eq(OrderAuctionBond::getMemberId, order.getMemberId())
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
        } else {
            orderAuctionBond = orderAuctionBondMapper.selectOne(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .eq(OrderAuctionBond::getOrderId, id)
                            .eq(OrderAuctionBond::getAuctionGoodsId,
                                    order.getGoodsSkuId())
                            .eq(OrderAuctionBond::getMemberId, order.getMemberId())
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
        }
        if (StringUtils.isNotNull(orderAuctionBond)) {
            Paylog paylog = iPaylogService.lambdaQuery()
            Optional<Paylog> paylogOpt = iPaylogService.lambdaQuery()
                    .in(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
                    .one();
            boolean result = handleRefund(orderAuctionBond.getPaymentMethod(), paylog,
                    orderAuctionBond.getOrderNo());
            if (result) {
                paylog.setState(3);// 已退款
                orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
                iPaylogService.updateById(paylog);
                this.updateById(order);
                    .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);
                }
            }

        }
    }

@@ -1611,4 +1878,25 @@
        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);
        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;
    }
}