From 62a50743d244b1c792c8152fcfea9c66242df92c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 27 四月 2023 15:56:58 +0800
Subject: [PATCH] 新增积分订单查询接口
---
crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java | 62 +++++++++++++++++++++++++++++++
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 10 +++++
2 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java
new file mode 100644
index 0000000..e61869a
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java
@@ -0,0 +1,62 @@
+package com.hz.crm.dto;
+
+import lombok.Data;
+
+@Data
+public class FOrderPageDto extends PageDto {
+ /**璁㈠崟鐘舵��*/
+ private Integer status;
+ /**璁㈠崟鏀粯鐘舵�� 0寰呬粯娆撅紱2宸叉敮浠橈紱3閮ㄥ垎鏀粯*/
+ private Integer payStatus;
+ /**璁㈠崟閫�娆剧姸鎬� 1鏃犻��娆撅紱2閮ㄥ垎閫�娆撅紱3宸查��娆�*/
+ private Integer refundStatus;
+ /**璁㈠崟绫诲瀷*/
+ private Integer orderType;
+ /**鐢ㄦ埛淇℃伅*/
+ private String userInfo;
+ /**鎺ㄨ崘浜�*/
+ private String relateUserName ;
+ /**鏄惁棣栧崟(0鍚�1鏄�)*/
+ private Integer ordersBuy;
+ /**鏀粯鏂瑰紡*/
+ private Integer paymentMethod;
+ /**鏄惁鑰佸甫鏂�*/
+ private Integer oldWithNew;
+ /**鏄惁浣跨敤浼樻儬鍒�(0鍚�1鏄�)*/
+ private Integer isCoupon;
+ /**涓嬪崟闂ㄥ簵*/
+ private String shopName;
+ /**鏄惁鍥㈠惁璁㈠崟*/
+ private Integer isGroup;
+ //鏄惁鍚屾 0鍏ㄩ儴鏈悓姝� 1鏈悓姝ヨ鍗� 2宸插悓姝ヨ鍗� 3鏈悓姝ョ粨璐� 4宸插悓姝ョ粨璐�
+ private Integer isSync;
+
+ /* 瀵煎嚭璁㈠崟绫诲瀷 1鏍囧噯璁㈠崟锛�2鍏呭�艰鍗曪紝3绉垎璁㈠崟*/
+ private Integer type;
+
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+
+ /* 瀵煎嚭璁㈠崟绫诲瀷 1鏍囧噯璁㈠崟 */
+ public final static Integer ORDER_STAN = 1;
+ /* 瀵煎嚭璁㈠崟绫诲瀷 2鍏呭�艰鍗� */
+ public final static Integer ORDER_RECH = 2;
+ /* 瀵煎嚭璁㈠崟绫诲瀷 3绉垎璁㈠崟 */
+ public final static Integer ORDER_INTE = 3;
+
+ /* 鍚屾璁㈠崟鐘舵�� 鍏ㄩ儴鏈悓姝� */
+ public final static Integer STATUS_SYNC_ALL = 0;
+ /* 鍚屾璁㈠崟鐘舵�� 鏈悓姝ヨ鍗� */
+ public final static Integer STATUS_SYNC_NO_ORDER = 1;
+ /* 鍚屾璁㈠崟鐘舵�� 宸插悓姝ヨ鍗� */
+ public final static Integer STATUS_SYNC_IN_ORDER = 2;
+ /* 鍚屾璁㈠崟鐘舵�� 鏈悓姝ョ粨璐� */
+ public final static Integer STATUS_SYNC_NO_PAY = 3;
+ /* 鍚屾璁㈠崟鐘舵�� 宸插悓姝ョ粨璐� */
+ public final static Integer STATUS_SYNC_IN_PAY = 4;
+
+
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
index c1ceea9..a4931f3 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
@@ -1,6 +1,7 @@
package com.hz.crm.feign;
import com.hx.resultTool.Result;
+import com.hz.crm.dto.FOrderPageDto;
import com.hz.crm.dto.OrderStatusDto;
import com.hz.crm.dto.order.refund.RefundDto;
import org.springframework.cloud.openfeign.FeignClient;
@@ -25,4 +26,13 @@
*/
@RequestMapping("/order/refund")
Result refundOrder(@RequestBody(required = false) RefundDto refundDto);
+
+
+ /**鏌ヨ鍒楄〃
+ *
+ * @param dto dto
+ * @return refundReturnDto瀹炰綋杞寲
+ */
+ @RequestMapping("/order/list")
+ Result list(@RequestBody(required = false) FOrderPageDto dto);
}
--
Gitblit v1.8.0