1、冲突代码合并

ZengTao

2025-10-11 f4712cb12cc653b2aff19379fd7756fcfb478b90

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java

@@ -8,9 +8,12 @@
import com.mes.order.mapper.OrderdetailMapper;
import com.mes.order.mapper.OrdersMapper;
import com.mes.order.service.OrdersService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;

@@ -24,9 +27,11 @@
 */
@Service
@DS("sd")
@Slf4j
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
@Autowired
    @Resource
private OrderdetailMapper orderdetailMapper;

    @Override
    public List<Orders> selectOrders() {
        //获取所有未完成的订单
@@ -63,7 +68,9 @@
    }

    @Override
    @Cacheable(value = "orderDetails", key = "#flowCardId",unless = "#result == null")
    public OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId){
        log.info("查询数据库一次：{}", flowCardId);
        return baseMapper.queryProductNameByFlowCardId(flowCardId);
    }
}