修改bug

rentaiming

2024-07-15 5674594f06ec038a5ac1633b881518ffbd8c6c02

修改bug

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java

File was renamed from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchaseInfo.java
@@ -1,4 +1,4 @@
package com.ruoyi.goods.domain;
package com.ruoyi.system.api.domain;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -41,7 +41,7 @@
    private Integer currentNumber;

    @ApiModelProperty(value = "团购唯一标识")
    private Long mubre;
    private String mubre;

    @ApiModelProperty(value = "成团人数")
    private Integer groupSize;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java

@@ -161,4 +161,6 @@
    @ApiModelProperty("失效时间")
    private LocalDateTime orderTimeSx;

    @ApiModelProperty("团购编号")
    private String groupNo;
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java

@@ -87,7 +87,6 @@
    @ApiModelProperty(value = "保证金订单编号")
    private String orderNo;


    @ApiModelProperty("失效时间")
    private LocalDateTime orderTimeSx;


 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CustomConfigDTO.java

@@ -5,7 +5,7 @@
import lombok.Data;

@Data
@ApiModel(value = "获取配置对象", description = "优惠卷对象")
@ApiModel(value = "获取配置对象", description = "获取配置对象")
public class CustomConfigDTO {
    @ApiModelProperty(value = "1 客服电话，2 商城订单说明配置，3 退货周期，用户在收货后{}天可申请售后")
   private Integer type;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java

@@ -92,4 +92,17 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String years;

    @ApiModelProperty(value = "最低加价金额")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal minimumMarkupAmount;

    @ApiModelProperty(value = "当前出价")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal presentBid;

    @ApiModelProperty(value = "最高出价")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal zgBid;


}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -37,6 +38,9 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal seckillPrice;

    @ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束")
    private StartStatusEnum startStatus;



    @ApiModelProperty(value = "已售数量")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java

@@ -72,6 +72,7 @@
    private String courierNumber;

    @ApiModelProperty("发货快递")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String logisticsNum;

    @ApiModelProperty("退货时间")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java

@@ -182,4 +182,8 @@
    private Integer orderZq;


    @ApiModelProperty(value = "团购的普通商品id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long SkuId;

}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java

@@ -57,6 +57,21 @@
            }

            @Override
            public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo(Long goodsSkuId, String source) {
                return R.fail("通过id团购商品失败:" + cause.getMessage());
            }

            @Override
            public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(GoodsGroupPurchaseInfo goodsGroupPurchaseInfo, String source) {
                return R.fail("通过id团购商品失败:" + cause.getMessage());
            }

            @Override
            public R<?> updgoodsGroupPurchaseInfo(GoodsGroupPurchaseInfo goodsGroupPurchaseInfo, String source) {
                return R.fail("通过修改团购商品失败:" + cause.getMessage());
            }

            @Override
            public R<GoodsSeckill> getGoodsSeckillOne(Long goodsSkuId, String source) {
                return R.fail("通过id查询秒杀商品失败:" + cause.getMessage());
            }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java

@@ -73,6 +73,11 @@
            }

            @Override
            public R<Order> getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
                return null;
            }

            @Override
            public R<List<OrderVO>> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
                return R.fail("根据团购商品用户d获取订单列表失败:" + cause.getMessage());
            }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java

@@ -48,6 +48,18 @@
    R<GoodsGroupPurchase> getGoodsSeckiGoodsGroupPurchaseOne(@RequestBody Long goodsSkuId,
                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo")
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody Long goodsSkuId,
                                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo1")
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                                                                  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/updgoodsGroupPurchaseInfo")
    R<?> updgoodsGroupPurchaseInfo(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                        @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-seckill/getGoodsSeckillOne")
    R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId,
                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java

@@ -85,6 +85,10 @@
    R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
                                                @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order/getOrderByGroupPurchaseMemberId1")
    R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order/getOrderByGroupPurchaseMemberList")
    R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
                                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -36,6 +36,7 @@
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -225,8 +226,14 @@
                R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data = membeOne.getData();
                articleCommentsVO.setMemberNickname(data.getNickname());
                articleCommentsVO.setMemberNickavatar(data.getAvatar());
                if (data!=null){
                    articleCommentsVO.setMemberNickname(data.getNickname());
                    articleCommentsVO.setMemberNickavatar(data.getAvatar());
                }else{
                    articleCommentsVO.setMemberNickname("平台发布");
                    articleCommentsVO.setMemberNickavatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                }

                LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
                wrapper1.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
                wrapper1.eq(MemberLike::getArticleId,articleCommentsVO.getId());
@@ -264,13 +271,19 @@
                    articleCommentsVO1.setContent(articleComments1.getContent());
                    articleCommentsVO1.setMemberId(articleComments1.getMemberId());
                    articleCommentsVO1.setId(articleComments1.getId());
                    articleCommentsVO1.setMemberNickname(data1.getNickname());
                    articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
                    articleCommentsVO1.setBmemberNickavatar(data1.getAvatar());
                    if (data1!=null){
                        articleCommentsVO1.setMemberNickname(data1.getNickname());
                        articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
                    }


                    articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
                    articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
                    articleCommentsVO1.setBmemberNickname(data2.getNickname());
                    articleCommentsVO1.setBmemberNickavatar(data2.getNickname());
                    if (data2!=null){
                        articleCommentsVO1.setBmemberNickname(data2.getNickname());
                        articleCommentsVO1.setBmemberNickavatar(data2.getAvatar());
                    }

                    articleCommentsVO1.setState(articleComments1.getState());
                    articleCommentsVO1.setBmemberId(data2.getId());


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java

@@ -57,7 +57,6 @@
        iAuctionSalesroomService.SaveBid(BidVO);
        return R.ok();
    }

    @PostMapping("/getAuctionBidRecord")
    @ApiOperation(value = "用户端-商品详情里面的出价记录")
    public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java

@@ -612,7 +612,9 @@
        wrapper2.eq(AuctionBidRecord::getAuctionType,2);
        wrapper2.eq(AuctionBidRecord::getTargetId,byId1.getId());
        wrapper2.eq(AuctionBidRecord::getDelFlag,0);
        AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper1);
        wrapper2.orderByDesc(AuctionBidRecord::getLastBidAmount);
        wrapper2.last("limit 1");
        AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper2);
        if (list2!=null){
            AuctionSalesroomGoodsInfoVO.setZgBid(list2.getLastBidAmount());
        }

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java

@@ -428,6 +428,7 @@
        memberAuctionSalesroomInfoVO.setAuthentication(byId.getAuthentication());
        memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime());
        memberAuctionSalesroomInfoVO.setSalesroomName(byId.getSalesroomName());
        memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime());
        memberAuctionSalesroomInfoVO.setType(byId.getType());
        memberAuctionSalesroomInfoVO.setDescription(byId.getDescription());
        memberAuctionSalesroomInfoVO.setSharePic(byId.getSharePic());
@@ -458,7 +459,10 @@
            forepartAuctionSalesroomGoodsVO.setStartingPrice(salesroomGoods.getStartingPrice());
            forepartAuctionSalesroomGoodsVO.setSalesroomStock(salesroomGoods.getSalesroomStock());
            forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(salesroomGoods.getStatus().getCode());
            forepartAuctionSalesroomGoodsVO.setMinimumMarkupAmount(salesroomGoods.getMinimumMarkupAmount());
            forepartAuctionSalesroomGoodsVO.setStartTime(salesroomGoods.getStartTime());
            forepartAuctionSalesroomGoodsVO.setYears(String.valueOf(goodsSku.getYears()));
            forepartAuctionSalesroomGoodsVO.setListingDuration(salesroomGoods.getListingDuration());
            forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec());
            forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
            LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -478,6 +482,28 @@
                forepartAuctionSalesroomGoodsVO.setIsBond(1);
                forepartAuctionSalesroomGoodsVO.setIsStatus(1);
            }

            LambdaQueryWrapper<AuctionBidRecord> wrapper2=Wrappers.lambdaQuery();
            wrapper2.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
            wrapper2.eq(AuctionBidRecord::getAuctionType,2);
            wrapper2.eq(AuctionBidRecord::getTargetId,salesroomGoods.getId());
            wrapper2.eq(AuctionBidRecord::getDelFlag,0);
            AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper1);
            if (list2!=null){
                forepartAuctionSalesroomGoodsVO.setZgBid(list2.getLastBidAmount());
            }

            LambdaQueryWrapper<AuctionBidRecord> wrapper5=Wrappers.lambdaQuery();
            wrapper5.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
            wrapper5.eq(AuctionBidRecord::getAuctionType,2);
            wrapper5.eq(AuctionBidRecord::getTargetId,salesroomGoods.getId());
            wrapper5.eq(AuctionBidRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId());
            wrapper5.eq(AuctionBidRecord::getDelFlag,0);
            AuctionBidRecord list5 = auctionBidRecordMapper.selectOne(wrapper1);
            if (list5!=null){
                forepartAuctionSalesroomGoodsVO.setPresentBid(list5.getLastBidAmount());
            }

            forepartAuctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO);
        }
        memberAuctionSalesroomInfoVO.setForepartAuctionSalesroomGoodsVO(forepartAuctionSalesroomGoodsVOS);

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java

@@ -1,9 +1,13 @@
package com.ruoyi.goods.controller.inner;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.goods.service.impl.GoodsGroupPurchaseInfoServiceImpl;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import lombok.RequiredArgsConstructor;
@@ -26,14 +30,70 @@

    private final IGoodsGroupPurchaseService goodsGroupPurchaseService;

    private final GoodsGroupPurchaseInfoServiceImpl goodsGroupPurchaseInfoServiceImpl;

    @InnerAuth
    @PostMapping("/getGoodsSeckiGoodsGroupPurchaseOne")
    @ResponseBody
    public R<GoodsGroupPurchase> getGoodsSeckiGoodsGroupPurchaseOne(@RequestBody Long goodsSkuId) {
        GoodsGroupPurchase GoodsSeckillOne = goodsGroupPurchaseService.getById(goodsSkuId);
        return R.ok(GoodsSeckillOne);
    }


    @InnerAuth
    @PostMapping("/getGoodsSeckiGoodsGroupPurchaseInfo")
    public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody Long goodsSkuId) {
        LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
        wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
        wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
        wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsSkuId);
        GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoServiceImpl.getOne(wrapper6);

        return R.ok(one1);
    }

    @InnerAuth
    @PostMapping("/getGoodsSeckiGoodsGroupPurchaseInfo1")
    public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo) {
        LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
        wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
        wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,goodsGroupPurchaseInfo.getMubre());
        GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoServiceImpl.getOne(wrapper6);
       int i=one1.getCurrentNumber()-1;
       if (i==0){
           one1.setCurrentNumber(0);
           one1.setGroupStatus(0);
           goodsGroupPurchaseInfoServiceImpl.updateById(one1);
           goodsGroupPurchaseInfoServiceImpl.removeById(one1);
       }else{
           one1.setCurrentNumber(i);
           if (one1.getGroupSize()>one1.getCurrentNumber()){
               one1.setGroupStatus(0);
           }
           goodsGroupPurchaseInfoServiceImpl.updateById(one1);
       }

        return R.ok(one1);
    }

    @InnerAuth
    @PostMapping("/updgoodsGroupPurchaseInfo")
    public R getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo) {
             if (goodsGroupPurchaseInfo.getId()!=null){
                 GoodsGroupPurchaseInfo byId = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId());
                 Integer num= byId.getCurrentNumber()+1;
                 byId.setCurrentNumber(num);
                 if (num==byId.getGroupSize()){
                     byId.setGroupStatus(1);
                 }
                 goodsGroupPurchaseInfoServiceImpl.updateById(byId);
             }else{
                 goodsGroupPurchaseInfoServiceImpl.save(goodsGroupPurchaseInfo);
             }

        return R.ok();
    }

    /**
     * 团购商品开始团购
     *

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsGroupPurchaseInfoMapper.java

@@ -1,6 +1,6 @@
package com.ruoyi.goods.mapper;

import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsGroupPurchaseInfoService.java

@@ -1,7 +1,7 @@
package com.ruoyi.goods.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;

/**
 * <p>

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseInfoServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.goods.mapper.GoodsGroupPurchaseInfoMapper;
import com.ruoyi.goods.service.IGoodsGroupPurchaseInfoService;
import org.springframework.stereotype.Service;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java

@@ -22,6 +22,7 @@
import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseDTO;
import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseQuery;
import com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.goods.domain.MemberGoodsCollection;
import com.ruoyi.goods.mapper.GoodsGroupPurchaseMapper;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
@@ -52,6 +53,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * <p>
 * 商品团购表 服务实现类
@@ -71,6 +74,9 @@
    private final RedisService redisService;
    private final IMemberGoodsCollectionService iMemberGoodsCollectionService;
    private final SysUserClient sysUserClient;

    @Resource
    private GoodsGroupPurchaseInfoServiceImpl  GoodsGroupPurchaseInfoServiceImpl;
    // 创建一个静态共享的ObjectMapper实例以重用
    private static final ObjectMapper objectMapper = new ObjectMapper();
    /**
@@ -323,12 +329,29 @@
        goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice());
        goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
        goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());
        goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());

        LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
        wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
        wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
        wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,one.getId());
        GoodsGroupPurchaseInfo one1 = GoodsGroupPurchaseInfoServiceImpl.getOne(wrapper6);
        if (one1!=null){
            goodsGroupPurchaseInfoVO.setCurrentNumber(one1.getCurrentNumber());
            if (one1.getGroupStatus()==0){
                goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
            }else{
                goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
            }

        }else{
            goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
            goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
        }
        goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
        goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
        goodsGroupPurchaseInfoVO.setDescription(one.getDescription());
        goodsGroupPurchaseInfoVO.setDetail(byId.getDescription());
        goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus());

        goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus());

        LambdaQueryWrapper<MemberGoodsCollection> wrapper4= Wrappers.lambdaQuery();
@@ -345,11 +368,24 @@
        HomeGoodsSkuDTO homeGoodsSkuDTO1=new HomeGoodsSkuDTO();
        homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
        homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
        Order data = orderClient.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
        Order data = orderClient.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
        if (data!=null){
            goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
            goodsGroupPurchaseInfoVO.setOrder(data);
            goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.YCT_FAILURE);

            LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper7= Wrappers.lambdaQuery();
            wrapper7.eq(GoodsGroupPurchaseInfo::getMubre,data.getGroupNo());
            GoodsGroupPurchaseInfo one7 = GoodsGroupPurchaseInfoServiceImpl.getOne(wrapper7);
            if (one7!=null){
                goodsGroupPurchaseInfoVO.setCurrentNumber(one7.getCurrentNumber());
                if (one7.getGroupStatus()==0){
                    goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
                }else{
                    goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
                }

            }
        }else{
            if (one.getGroupStatus().getCode()==0){
                if (one.getGroupSize()-one.getCurrentNumber()<5){

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java

@@ -49,11 +49,11 @@
        DelayTask delayTask = new DelayTask();
        delayTask.setDelFlag(0);
        delayTask.setCreateTime(LocalDateTime.now());
        delayTask.setExecuteTime(byId.getStartTime().minusMinutes(30));
        delayTask.setExecuteTime(byId.getStartTime().minusMinutes(5));
        delayTask.setRedisKey(DelayTaskEnum.AUTOMATIC_CANCEL.getCode() + "-" + byId.getId());
        sysUserClient.addDelayTask(delayTask, SecurityConstants.INNER);

        Duration duration = Duration.between(LocalDateTime.now(), byId.getStartTime().minusMinutes(30));
        Duration duration = Duration.between(LocalDateTime.now(), byId.getStartTime().minusMinutes(5));

        redisService.setCacheObject(
                DelayTaskEnum.AUTOMATIC_CANCEL.getCode() + "-" + byId.getId(),

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java

@@ -32,7 +32,6 @@
     * 获取当前商品信息
     *
     */

    @Resource
    private IMemberAddressService iMemberAddressService;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/async/AsyncMethodService.java

@@ -103,6 +103,6 @@
                .build();
        List<MemberLevel> memberLevels = Lists.newArrayList(build1, build2, build3, build4,
                build5, build6, build7, build8, build9, build10);
        System.out.println(findAppropriateLevel(memberLevels, BigDecimal.valueOf(50)));
        System.out.println(findAppropriateLevel(memberLevels, BigDecimal.valueOf(499)));
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java

@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -243,7 +244,6 @@
                Member member1=this.getOne(wrapper1);

                if (member1==null){

                        //创建新用户
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
@@ -550,38 +550,32 @@
        this.updateById(byId);
        LambdaQueryWrapper<MemberLevel> wrapper= Wrappers.lambdaQuery();
        List<MemberLevel> list = memberLevelMapper.selectList(wrapper);
        for (int i=0;i<list.size();i++){
            if (i==0){
                int ia = byId.getMoney().compareTo(list.get(0).getCumulativeConsumption());
                if (ia<0){
                    byId.setLevel(0);
                    break;
                }
            }
            if (i==list.size()-1){
                BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
                BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
                if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
                    byId.setLevel(list.get(i).getLevel());
                }else{
                    if (cumulative1.compareTo(byId.getMoney())<=0){
                        byId.setLevel(list.get(i).getLevel());
                    }

                }
            }else {
                if (i!=0&&i!=list.size()-1){
                    BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
                    BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
                    if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
                        byId.setLevel(list.get(i).getLevel());
                    }
                }

            }

        }
        int appropriateLevel = findAppropriateLevel(list, byId.getMoney());
        byId.setLevel(appropriateLevel);
        this.updateById(byId);
    }


    private static int findAppropriateLevel(List<MemberLevel> memberLevels, BigDecimal money) {
        // 对于最开始的level，设置为0（假设0是最低等级）
        int level = 0;

        for (int i = 0; i < memberLevels.size(); i++) {
            MemberLevel currentLevel = memberLevels.get(i);
            BigDecimal currentCumulativeConsumption = currentLevel.getCumulativeConsumption();

            // 如果当前成员的消费额小于等于当前等级的累积消费额
            if (money.compareTo(currentCumulativeConsumption) < 0) {
                return level;
            }

            // 更新level为当前等级，准备下一次比较
            level = currentLevel.getLevel();
        }

        // 如果遍历完成后还没有返回，说明该成员的消费额高于所有已定义等级的累积消费额
        level = memberLevels.get(memberLevels.size() - 1).getLevel();
        return level;
    }

    /**
@@ -634,6 +628,8 @@
                .orderByDesc(Member::getLevel)
                .list();
    }


}



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java

@@ -133,6 +133,13 @@
    R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
        return R.ok(orderService.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO));
    }
    @InnerAuth
    @ResponseBody
    @PostMapping("/getOrderByGroupPurchaseMemberId1")
    R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
        return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO));
    }


    @InnerAuth
    @ResponseBody

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -40,6 +40,8 @@
    List<Order> getOrderByGroupPurchaseId(@Param("id") Long id);
    Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO);

    Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO);

    List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO);

    /**

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java

@@ -56,6 +56,8 @@
    List<Order> getOrderByGroupPurchaseId(Long id);

    Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO);

    Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO);
    List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO);

    MemberTiOrderVO saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);

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

@@ -111,9 +111,13 @@
    public OrderReturnVO OrderReturnRequestInfo(OrderReturnDTO OrderReturnDTO) {
        LambdaQueryWrapper<OrderReturnRequest> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(OrderReturnRequest::getOrderId,OrderReturnDTO.getOrderId());
        OrderReturnRequest one = this.getOne(wrapper);
        OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
        List<OrderReturnRequest> list = this.list(wrapper);
        OrderReturnVO orderReturnVO =null;
        if(list.size()>0){
            orderReturnVO= BeanUtils.copyBean(list.get(0), OrderReturnVO.class);
        }
        return orderReturnVO;

    }

    @Override

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

@@ -36,17 +36,7 @@
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.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.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.*;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -70,10 +60,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -250,6 +237,11 @@
    }

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

    @Override
    public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
    }
@@ -389,7 +381,7 @@
            memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
            pice=data.getGroupPurchasePrice();

            goodsSkuClient.GroupPurchaseNum(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER);


            order.setSkuName(goodsSku.getSkuName());
            order.setPrice(data.getGroupPurchasePrice());
@@ -473,9 +465,8 @@
        }if (memberOrderDTO.getGoodsQuantity()!=null){
            if (order.getOrderFrom().getCode()==1){
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();

                if (goodsSku.getStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
                    throw new ServiceException("该商品已售罄，暂无库存");
                    throw new ServiceException("该商品库存不足");
                }

                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
@@ -512,14 +503,14 @@
                GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();

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


                        if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
                            throw new ServiceException("该商品已售罄，暂无库存");
                            throw new ServiceException("该商品库存不足");
                        }

                        GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
@@ -564,7 +555,7 @@
                        throw new ServiceException("对不起，大于商品购买数");
                    }else{
                        if (data.getLimitNumber()<memberOrderDTO.getGoodsQuantity()){
                            throw new ServiceException("该商品已售罄，暂无库存");
                            throw new ServiceException("对不起，大于商品购买数");
                        }else{
                            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
                            memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -769,6 +760,7 @@
            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(
@@ -815,12 +807,24 @@
            order.setCancelTime(LocalDateTime.now());
            baseMapper.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();
                GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
                    goodsStockUpdDTO1.setSoldQuantity(0);
                }else {
                    goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                }

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

@@ -829,9 +833,15 @@
                GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
                    goodsStockUpdDTO1.setSoldQuantity(0);
                }else {
                    goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                }
                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
            }




        }
@@ -845,7 +855,11 @@
                GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
                    goodsStockUpdDTO1.setSoldQuantity(0);
                }else {
                    goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                }
                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
            }

@@ -854,7 +868,11 @@
                GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
                    goodsStockUpdDTO1.setSoldQuantity(0);
                }else {
                    goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                }
                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
            }

@@ -915,8 +933,19 @@
    @Override
    public void delOrderOne(MemberOrderListDTO memberOrderListDTO) {

        Order byId = this.getById(memberOrderListDTO.getId());
        goodsSkuClient.GroupPurchaseNum1(byId.getGoodsSkuId(), SecurityConstants.INNER);
         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 (goodsSeckiGoodsGroupPurchaseInfo!=null){
                GoodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

            }
        }

        this.removeById(memberOrderListDTO.getId());
        if (byId.getOrderStatus().getCode() == 2) {

@@ -964,7 +993,6 @@
                }
            }
        }
        baseMapper.deleteById(memberOrderListDTO.getId());
    }

    @Override
@@ -978,27 +1006,27 @@
            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.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);

                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 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 regEx = "[^0-9]";
                    Pattern p = Pattern.compile(regEx);
@@ -1009,6 +1037,9 @@
                        System.out.println("微信退款失败");
                    }
                }
            }



        }else{
            order.setOrderStatus(OrderStatusEnum.FINISHED);

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

@@ -35,9 +35,7 @@
import com.ruoyi.order.util.tencent.common.XMLParser;
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
@@ -89,7 +87,7 @@
    private OrderAuctionBondMapper orderAuctionBondMapper;

    @Resource
    private GoodsSkuClient GoodsSkuClient;
    private GoodsSkuClient goodsSkuClient;

    @Override
    public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
@@ -117,28 +115,52 @@
                    page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
                    page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
                    page1.setPayTime(LocalDateTime.now());
                    OrderMapper.updateById(page1);


                    if(page1.getOrderNo().contains("SP")){
                        GoodsSku goodsSku =new GoodsSku();
                        goodsSku.setId(page1.getGoodsSkuId());
                        goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                        GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                        goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                    }

                    if(page1.getOrderNo().contains("MS")){
                        GoodsSku goodsSku =new GoodsSku();
                        goodsSku.setId(page1.getGoodsSkuId());
                        goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                        GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                        goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                    }

                    MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                    memberPointsDTO.setMemberId(page1.getMemberId());
                    memberPointsDTO.setPointsType(1);
                    memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                    memberPointsDTO.setPoints(page1.getPoints());
                    memberClient.addMemberPoints(memberPointsDTO);

                    if(page1.getOrderNo().contains("TG")){
                        GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                        GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                        if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                            goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
                            page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
                        }else{
                            UUID uuid = UUID.randomUUID();
                            GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
                            goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
                            goodsGroupPurchaseInfo.setCurrentNumber(1);
                            goodsGroupPurchaseInfo.setMubre(uuid.toString());
                            goodsGroupPurchaseInfo.setGroupPurchaseId(page1.getGoodsSkuId());
                            goodsGroupPurchaseInfo.setGroupStatus(0);
                            goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
                            page1.setGroupNo(uuid.toString());
                        }
                    }
                    OrderMapper.updateById(page1);

                    if (page1.getPoints()!=0){
                        MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                        memberPointsDTO.setMemberId(page1.getMemberId());
                        memberPointsDTO.setPointsType(1);
                        memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                        memberPointsDTO.setPoints(page1.getPoints());
                        memberClient.addMemberPoints(memberPointsDTO);
                    }

                    updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
                    MembeOneDTO.setType(1);
                    MembeOneDTO.setMemberId(page1.getMemberId());
@@ -183,14 +205,14 @@
                            GoodsSku goodsSku =new GoodsSku();
                            goodsSku.setId(page1.getGoodsSkuId());
                            goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                            GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                            goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                        }

                        if(page1.getOrderNo().contains("MS")){
                            GoodsSku goodsSku =new GoodsSku();
                            goodsSku.setId(page1.getGoodsSkuId());
                            goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                            GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                            goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                        }


@@ -325,25 +347,26 @@
                                GoodsSku goodsSku =new GoodsSku();
                                goodsSku.setId(page1.getGoodsSkuId());
                                goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                                GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                                goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                            }

                            if(page1.getOrderNo().contains("MS")){
                                GoodsSku goodsSku =new GoodsSku();
                                goodsSku.setId(page1.getGoodsSkuId());
                                goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                                GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                                goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                            }
                            page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
                            page1.setPayTime(LocalDateTime.now());
                            OrderMapper.updateById(page1);

                            if (page1.getPoints()!=0){
                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                            memberPointsDTO.setMemberId(page1.getMemberId());
                            memberPointsDTO.setPointsType(1);
                            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                            memberPointsDTO.setPoints(page1.getPoints());
                            memberClient.addMemberPoints(memberPointsDTO);
                            }
                            updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
                            MembeOneDTO.setType(1);
                            MembeOneDTO.setMemberId(page1.getMemberId());
@@ -475,22 +498,40 @@
                                GoodsSku goodsSku =new GoodsSku();
                                goodsSku.setId(page1.getGoodsSkuId());
                                goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                                GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                                goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
                            }

                            if(page1.getOrderNo().contains("MS")){
                                GoodsSku goodsSku =new GoodsSku();
                                goodsSku.setId(page1.getGoodsSkuId());
                                goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                                GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                                goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                            }

                            if(page1.getOrderNo().contains("TG")){
                                GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                                GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                                    goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
                                    page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
                                }else{
                                    UUID uuid = UUID.randomUUID();
                                    GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
                                    goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
                                    goodsGroupPurchaseInfo.setCurrentNumber(1);
                                    goodsGroupPurchaseInfo.setMubre(uuid.toString());
                                    goodsGroupPurchaseInfo.setGroupStatus(0);
                                    goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
                                    page1.setGroupNo(uuid.toString());
                                }
                            }
                            if (page1.getPoints()!=0){
                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                            memberPointsDTO.setMemberId(page1.getMemberId());
                            memberPointsDTO.setPointsType(1);
                            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                            memberPointsDTO.setPoints(page1.getPoints());
                            memberClient.addMemberPoints(memberPointsDTO);
                            }
                            updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
                            MembeOneDTO.setType(1);
                            MembeOneDTO.setMemberId(page1.getMemberId());

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java

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

    @Override
    public List<CouponMemberVO> getCouponMemberl(CouponMemberDTO couponMemberDTO) {

        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
        wrapper.eq(Coupon::getDelFlag,0);
@@ -96,8 +95,7 @@
                .collect(Collectors.toSet());

        LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(CouponMember::getCouponStatus,
                CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
        wrapper1.eq(CouponMember::getCouponStatus, 0);
        wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
        if (CouponList.size()>0){
            wrapper1.notIn(CouponMember::getCouponId,CouponList);