From eb7f3343af839a7c71f16e8ada2b25d5e2201c08 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 四月 2021 19:27:52 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/api/VIPController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
index 378611d..d9c02f3 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
@@ -23,6 +23,7 @@
import com.yeshi.buwan.util.vip.VIPOrderUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.client.user.UserInfoVO;
+import com.yeshi.buwan.vo.order.OrderInfoVO;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +37,7 @@
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -108,9 +110,9 @@
}
- @RequestMapping("getVIPOrderList")
+ @RequestMapping("getOrderList")
@ResponseBody
- public String getVIPOrderList(AcceptData acceptData, String loginUid, int page) {
+ public String getOrderList(AcceptData acceptData, String loginUid, String type, int page) {
Gson gson = new GsonBuilder().registerTypeAdapter(VIPPriceType.class, new JsonSerializer<VIPPriceType>() {
@Override
public JsonElement serialize(VIPPriceType value, Type theType, JsonSerializationContext context) {
@@ -132,13 +134,14 @@
}).create();
JSONObject root = new JSONObject();
- List<OrderRecord> list = orderService.listOrderRecord(loginUid, OrderType.vip, null, page, Constant.pageCount);
+ List<OrderRecord> list = orderService.listOrderRecord(loginUid, OrderType.valueOf(type), null, page, Constant.pageCount);
+
+ List<OrderInfoVO> voList = new ArrayList<>();
for (OrderRecord record : list) {
- record.setIpInfo(null);
- record.setUpdateTime(null);
+ voList.add(OrderInfoVO.create(record));
}
- long count = orderService.countOrderRecord(loginUid, OrderType.vip, null);
- root.put("list", gson.toJson(list));
+ long count = orderService.countOrderRecord(loginUid, OrderType.valueOf(type), null);
+ root.put("list", gson.toJson(voList));
root.put("count", count);
return JsonUtilV2.loadTrueJson(root.toString());
}
@@ -171,6 +174,9 @@
return JsonUtilV2.loadFalseJson("璇烽�夋嫨璐拱绫诲瀷");
}
+ if (goldCorn == null)
+ goldCorn = 0;
+
OrderType orderType = OrderType.vip;
if (!StringUtil.isNullOrEmpty(infoId)) {
--
Gitblit v1.8.0