修改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;
@@ -515,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());
@@ -858,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);
@@ -1260,16 +1266,21 @@

                        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());
                            }
                            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);
                                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,
                                        SecurityConstants.INNER);
                            }
                        }

                        if(order.getOrderNo().contains("MS")){