合并代码

Pu Zhibing

2024-10-16 c4664502dfdaffff555b532e65b51a57ac8b29c2

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/AccountingStrategyDetailOrderController.java

@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RestController;

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

/**
 * @author zhibing.pu
@@ -36,4 +37,18 @@
            .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
      return R.ok(one);
   }
	
	
   /**
    * 获取订单对应的计费策略数据
    * @param orderId
    * @return
    */
   @PostMapping("/getAllAccountingStrategyDetailOrder")
   public R<List<AccountingStrategyDetailOrder>> getAllAccountingStrategyDetailOrder(@RequestParam("orderId") Long orderId){
      List<AccountingStrategyDetailOrder> one = accountingStrategyDetailOrderService.list(new LambdaQueryWrapper<AccountingStrategyDetailOrder>()
            .eq(AccountingStrategyDetailOrder::getChargingOrderId, orderId)
            .orderByAsc(AccountingStrategyDetailOrder::getStartTime));
      return R.ok(one);
   }
}