blame | history | patch | commit | commitdiff | ignore whitespace
leomonM
2025-08-25 f28edc2cbe546c58e60065bd3cbb04125e346077 
 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java


@@ -1,28 +1,31 @@


package com.oying.modules.sh.service.impl;




import com.alibaba.fastjson2.JSON;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.oying.exception.BadRequestException;


import com.oying.modules.message.common.MesTypeEnum;


import com.oying.modules.message.common.MsgStatusEnum;


import com.oying.modules.message.service.MesMsgRecordService;


import com.oying.modules.sh.domain.OrderOperationLog;


import com.oying.modules.sh.domain.dto.OrderOperationLogQueryCriteria;


import com.oying.modules.sh.domain.vo.OrderResponse;


import com.oying.modules.sh.mapper.OrderMapper;


import com.oying.modules.sh.mapper.OrderOperationLogMapper;


import com.oying.modules.sh.service.OrderOperationLogService;


import com.oying.utils.*;


import com.oying.utils.enums.OrderStatusEnum;


import lombok.RequiredArgsConstructor;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.oying.modules.sh.service.OrderOperationLogService;


import com.oying.modules.sh.domain.dto.OrderOperationLogQueryCriteria;


import com.oying.modules.sh.mapper.OrderOperationLogMapper;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import java.sql.Timestamp;


import java.util.List;


import java.util.Map;


import java.io.IOException;


import javax.servlet.http.HttpServletResponse;


import java.io.IOException;


import java.sql.Timestamp;


import java.util.ArrayList;


import java.util.LinkedHashMap;


import java.util.List;


import java.util.Map;




/**


 * @author lixin


@@ -35,6 +38,7 @@




    private final OrderOperationLogMapper orderOperationLogMapper;


    private final OrderMapper orderMapper;


    private final MesMsgRecordService mesMsgRecordService;




    @Override


    public PageResult<OrderOperationLog> queryAll(OrderOperationLogQueryCriteria criteria, Page<Object> page) {


@@ -90,10 +94,10 @@


                orderOperationLogMapper.insert(log1);


                response.getOrder().setOrderStatus(OrderStatusEnum.TWO.getKey());


                response.getOrder().setOrderStatusDescribe(OrderStatusEnum.TWO.getValue());


            case FOUR:


            case THREE:


                userType = ConstantsKey.MERCHANT;


                break;


            case THREE:


            case FOUR:


                orderMapper.updateRider(response.getOrder().getOrderNum(), SecurityUtils.getCurrentUserId(), SecurityUtils.getCurrentUsername(), cardName);


            case FIVE:


            case SIX:


@@ -117,7 +121,26 @@


                orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());


                statusEnum = OrderStatusEnum.EIGHT;


                break;


            case TEN:


            case TWELVE:


                userType = ConstantsKey.BUYER;


                orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());


                break;


            case FIFTEEN:


                userType = ConstantsKey.BUYER;


                orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), OrderStatusEnum.EIGHT.getKey(), OrderStatusEnum.EIGHT.getValue());


                break;


            case ELEVEN:


                userType = ConstantsKey.MERCHANT;


                orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), OrderStatusEnum.EIGHT.getKey(), OrderStatusEnum.EIGHT.getValue());


                break;


            case THIRTEEN:


            case FOURTEEN:


                userType = ConstantsKey.MERCHANT;


                orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());


                break;


            default:


                throw new BadRequestException("状态错误");


        }


        if (username == null) {


            username = SecurityUtils.getCurrentUsername();


@@ -136,6 +159,7 @@


        resources.setSnapshotData(JSON.toJSONString(map));


        resources.setOperationTime(time);


        orderOperationLogMapper.insert(resources);


        mesMsgRecordService.insertOrderMsg(response.getOrder(), MsgStatusEnum.MERCHANT_ACCEPTED, MesTypeEnum.ORDER);


        orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());


    }