From 532f9b705c74b7eded523f900965dc81c1dd7893 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 01 七月 2022 10:57:30 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index 98055d4..fd5b6b3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -14,7 +14,6 @@
import com.sandu.ximon.admin.service.C3mChargingChargeService;
import com.sandu.ximon.admin.service.C3mOrderService;
import com.sandu.ximon.admin.utils.AliPayUtils;
-import com.sandu.ximon.dao.bo.C3mOrderBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.enums.OrderType;
@@ -23,7 +22,6 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
-import java.util.List;
import java.util.SortedMap;
/**
@@ -64,7 +62,7 @@
*/
@AnonymousAccess
@PostMapping("/advancePay")
- public ResponseVO<Object> advancePayOrder(@OpenId String openId,@RequestBody PayParam param) throws WxErrorException {
+ public ResponseVO<Object> advancePayOrder(@OpenId String openId, @RequestBody PayParam param) throws WxErrorException {
if (param.getOpenId().isEmpty()) {
throw new BusinessException("寰俊code涓嶈兘涓虹┖");
}
@@ -126,11 +124,19 @@
/**
* 璁㈠崟鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param keyword 鐏潌鍚嶇О
+ * @param orderStatus 璁㈠崟鐘舵�侊細// 鏈敮浠�(0) 宸叉敮浠�(1),閫�娆句腑(2),宸查��娆�(3),璁㈠崟瀹屾垚(4),閫�娆惧け璐�5)
+ * @param timeType 鏃堕棿 1锛氫竴涓湀 2锛氫笁涓湀 3锛氬叚涓湀
+ * @return
*/
@GetMapping("/list")
- public ResponseVO<Object> list(BaseConditionVO baseConditionVO) {
- List<C3mOrderBo> list = c3mOrderService.orderList(baseConditionVO);
- return ResponseUtil.successPage(list);
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "orderStatus", required = false) Integer orderStatus,
+ @RequestParam(value = "timeType", required = false) Integer timeType) {
+ return ResponseUtil.successPage(c3mOrderService.orderList(baseConditionVO, keyword, orderStatus, timeType));
}
/**
--
Gitblit v1.9.3