修改bug

rentaiming

2024-07-27 23cd5d3ce1d855d06c4a6a295149c6cf5d6255ae

修改bug

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

@@ -446,12 +446,18 @@
            List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
                            SecurityConstants.INNER)
                    .getData();
            if (goodsSku.size()>0){
            goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
                    .collect(Collectors.toSet());
        }

        }

        AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
        if (goodsSkuIdList!=null){
        auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
        }


        Page<AuctionGoodsListVO> page = new Page<>();
        page.setSize(auctionGoodsListDTO.getPageSize());

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

@@ -655,8 +655,17 @@
    @Override
    public List<AuctionBidRecordVO> getAuctionBidRecord(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
        LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();

        AuctionSalesroom byId = auctionSalesroomMapper.selectById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
        if (byId==null){
            LambdaQueryWrapper<AuctionSalesroom> wrapper1=Wrappers.lambdaQuery();
            wrapper1.eq(AuctionSalesroom::getAuctionSalesroomNo,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
            wrapper1.eq(AuctionSalesroom::getDelFlag,0);
            byId =auctionSalesroomMapper.selectOne(wrapper1);
        }

        if (auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()!=null){
            wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
            wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
        }
        wrapper.eq(AuctionBidRecord::getDelFlag,0);
        wrapper.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());

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

@@ -243,12 +243,12 @@

    @Override
    public AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO) {
        R<SysUser> r=sysUserClient.queryUserByPhone(arepartAuctionBidRecordDTO.getPhone());
        R<SysUser> r=sysUserClient.queryUserByPhone1(arepartAuctionBidRecordDTO.getPhone());
        SysUser sysUser=r.getData();
        if (sysUser==null){
            throw new ServiceException("手机号未注册");
        }
        if (sysUser.getStatus().equals(1)){
        if (sysUser.getStatus().equals("1")){
            throw new ServiceException("该拍卖师账号停用");
        }


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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.api.domain.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.domain.AuctionVideo;
@@ -56,7 +57,7 @@
        wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
        AuctionSalesroomGoods auctionSalesroomGoods=auctionSalesroomGoodsMapper.selectOne(wrapper);
        if (auctionSalesroomGoods!=null){
            R.fail("当前有拍卖品正在拍卖中，请结束后再试！");
            throw new ServiceException("当前有拍卖品正在拍卖中，请结束后再试！");
        }

        LambdaQueryWrapper<AuctionVideo> wrapper1=Wrappers.lambdaQuery();

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

@@ -394,9 +394,9 @@
                    .ge(GoodsSku::getYears, parseTime15);
        }
        if (homeGoodsSkuDTO.getSort()==1){
            wrapper3.last(" ORDER BY IF(isnull(sort_num),1,0), sort_num ASC");
            wrapper3.last(" ORDER BY IF(isnull(sort_num),1,0), sort_num DESC");
        }else{
            wrapper3.last(",IF(isnull(sort_num),1,0), sort_num ASC");
            wrapper3.last(",IF(isnull(sort_num),1,0), sort_num DESC");
        }
        Page<GoodsSku> page1 = this.page(page, wrapper3);
        PageDTO<HomeGoodsSkuListVO> articleCommentsVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class);

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

@@ -885,6 +885,7 @@
        OrderVO orderVO=new OrderVO();
        try {
            orderVO = BeanUtils.copyBean(order, OrderVO.class);
            orderVO.setAuctionType(order.getAuctionOrderType());
            if (orderVO.getOrderFrom().getCode()==3){
                GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                orderVO.setGroupTime(data.getGroupTime());
@@ -1326,6 +1327,7 @@
            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());
@@ -1339,18 +1341,14 @@
                    if (one1.getGroupStatus() == 1) {
                        goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
                    }
                    if (goodsGroupPurchaseeVO1.getStartStatus().getCode() == 1) {
                        if (one1.getGroupStatus() == 2) {
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
                        }
                    } else {
                        if (one1.getGroupStatus() == 2) {
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                        }
                }else{
                    goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
                }
                    }


                }