修改bug

rentaiming

2024-07-12 8b41a2bfe49f7bfe15abba9183ce2135182c1cf7

修改bug

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

@@ -173,5 +173,13 @@
    private String logisticsNum;


    @ApiModelProperty(value = "订单说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderShuoMin;

    @ApiModelProperty(value = "订单退货周期")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer orderZq;


}

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

@@ -425,6 +425,9 @@
        wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
        wrapper2.eq(AuctionSalesroomGoods::getId,auctionSalesroomGoodsDTO.getGoodsSkuId());
        AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2);
        if (auctionSalesroomGoods==null){
            throw new ServiceException("拍卖会已没有待开始拍卖商品");
        }
        auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS);
        auctionSalesroomGoods.setStartTime(LocalDateTime.now());
        if (auctionSalesroomGoods.getBackupStatus()){

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

@@ -241,6 +241,10 @@
        if (sysUser==null){
            throw new ServiceException("手机号未注册");
        }
        if (sysUser.getStatus().equals(1)){
            throw new ServiceException("该拍卖师账号停用");
        }

      if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){
            throw new ServiceException("密码输入错误");
        }
@@ -651,7 +655,12 @@
                one.setTargetId(bidVO.getTargetId());
                one.setMemberId(bidVO.getMemberId());
                one.setLastBidTime(LocalDateTime.now());
                one.setNickname(membeOne.getNickname());
                if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
                    one.setNickname(membeOne.getRealName());
                }else{
                    one.setNickname(membeOne.getNickname());
                }

                one.setPhone(membeOne.getPhone());
                one.setAuctionType(AuctionOrderTypeEnum.AUCTION_ITEMS);
                one.setStatus(BidStatusEnum.ELIMINATE);
@@ -729,6 +738,12 @@
                    one3.setAuctionSalesroomId(bidVO.getAuctionSalesroomId());
                    one3.setTargetId(bidVO.getTargetId());
                    one3.setMemberId(bidVO.getMemberId());
                    if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
                        one3.setNickname(membeOne.getRealName());
                    }else{
                        one3.setNickname(membeOne.getNickname());
                    }
                    one3.setPhone(membeOne.getPhone());
                    one3.setLastBidTime(LocalDateTime.now());
                    one3.setAuctionType(AuctionOrderTypeEnum.REGULAR_ITEMS);
                    one3.setStatus(BidStatusEnum.ELIMINATE);

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

@@ -305,6 +305,7 @@
        GoodsSku byId = goodsSkuService.getById(homeGoodsSkuDTO.getGoodsSkuId());
        LambdaQueryWrapper<GoodsGroupPurchase> wrapper3= Wrappers.lambdaQuery();
        wrapper3.eq(GoodsGroupPurchase::getDelFlag,0);
        wrapper3.eq(GoodsGroupPurchase::getGoodsSkuId,homeGoodsSkuDTO.getGoodsSkuId());
        wrapper3.eq(GoodsGroupPurchase::getListingStatus,0);
        List arr=new ArrayList<>();
        arr.add(0);

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

@@ -800,6 +800,10 @@
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
        orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
        CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
        orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
        return orderVO;
    }