1.

phpcjl

2024-12-06 80c6d9fc86582de1478ddbe4cf99f43947cdcaa4

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

@@ -14,6 +14,8 @@
import com.ruoyi.order.enums.OrderType;
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.vo.OrderDetailVO;
import com.ruoyi.order.vo.OrderGoodsVO;
@@ -24,8 +26,6 @@
import com.ruoyi.other.api.domain.Technician;
import com.ruoyi.other.api.feignClient.TechnicianClient;
import com.ruoyi.system.api.model.LoginUser;
import model.Order;
import model.OrderGood;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -54,6 +54,7 @@
    private TokenService tokenService;
    @Resource
    private TechnicianClient technicianClient;


    @Override
    public List<OrderVO> selectOrderListByUserId(Integer status, Long userId) {
@@ -114,6 +115,7 @@

        OrderDetailVO orderDetailVO = new OrderDetailVO();
        orderDetailVO.setId(order.getId());
        orderDetailVO.setOrderStatus(order.getOrderStatus());
        orderDetailVO.setPoint(order.getPoint());
        orderDetailVO.setAddressId(userAddress.getId());
        orderDetailVO.setRecieveName(userAddress.getRecieveName());
@@ -184,4 +186,11 @@
            }
        }
    }



    @Override
    public void commission(Long orderId) {

    }
}