Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-02-14 e097b03e9032a8e884c36e6a28d8b5002780daeb

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

@@ -160,7 +160,7 @@


    @Override
    public void saveOrderOne(OrderDTO OrderDTO) {
    public Long saveOrderOne(OrderDTO OrderDTO) {
        Order order=new Order();
        if (OrderDTO.getOrderFrom().getCode()==1){
            order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
@@ -234,7 +234,7 @@

        }


        return order.getId();
    }

    /**
@@ -573,6 +573,7 @@

    @Override
    public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {

        Order order = baseMapper.selectById(memberOrderDTO.getId());
        if(memberOrderDTO.getOrderRemark()!=null){
            order.setOrderRemark(memberOrderDTO.getOrderRemark());