修改bug

rentaiming

2024-07-30 256c98cc6ebd7f04d55e19324c9d9f12ac8ed476

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

@@ -789,7 +789,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);
@@ -885,6 +885,8 @@
        OrderVO orderVO=new OrderVO();
        try {
            orderVO = BeanUtils.copyBean(order, OrderVO.class);
            orderVO.setAuctionType(order.getAuctionOrderType());
            orderVO.setCouponId(order.getCouponId());
            if (orderVO.getOrderFrom().getCode()==3){
                GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                orderVO.setGroupTime(data.getGroupTime());
@@ -980,6 +982,7 @@
                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);

                }
@@ -1022,6 +1025,7 @@
                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);

                }
@@ -1087,11 +1091,9 @@
         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){
                goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(byId.getGoodsQuantity());
                GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

            }
@@ -1309,6 +1311,7 @@
        wrapper1.eq(Order::getOrderFrom,3);
        wrapper1.eq(Order::getDelFlag,0);
        wrapper1.eq(Order::getOrderStatus,2);
        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);
@@ -1326,6 +1329,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 +1343,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());
                }
            }




@@ -1815,6 +1815,9 @@

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