From 645c16466ce9dbe563c03943b0ab5fd46c8eed00 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 16:40:33 +0800
Subject: [PATCH] 免单券类型获得
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
index 8f9dacf..2da5b18 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
@@ -256,7 +256,7 @@
if (orderType != null && dateType != null && dateType == 4) {
if (orderType == 1) {
- dateType = 6; // 杩斿埄璁㈠崟鏈夋晥
+ dateType = 6; // 杩斿埄璁㈠崟鏈夋晥鐨�
} else {
dateType = 5; // 鏂扮増鏌ヨ鏈湀鍒拌处
}
@@ -313,7 +313,11 @@
List<ESOrder> listES = esOrderService.query(key, uid.toString(), listSource);
if (listES.size() != 0) {
- list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
+ // 2.1鐗堟湰
+ AcceptData acceptData = new AcceptData();
+ acceptData.setPlatform("android");
+ acceptData.setVersion("56");
+ list = commonOrderService.searchOrderByUid(acceptData, page, Constant.PAGE_SIZE, uid, listES);
count = commonOrderService.countSearchOrderByUid(uid, listES);
}
--
Gitblit v1.8.0