From c73425451381d5338de8a47253bae007eddc7c8f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 31 五月 2024 17:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java | 16 ----------------
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 6 +++++-
phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java | 15 +++++++++++++++
4 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 01f8bca..c53c4c5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -162,6 +162,10 @@
@PostMapping(value = "/coupon/birthday/list/user")
Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
-
+ /**
+ * 鑾峰彇浼樻儬鍒搁鍙栬鍒欏垪琛�
+ */
+ @PostMapping(value = "/coupon/receive/rule/list")
+ Result getReceiveRuleList();
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java b/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java
new file mode 100644
index 0000000..30f58c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java
@@ -0,0 +1,15 @@
+package com.hz.his.vo.coupon;
+
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒搁鍙栬鍒�
+ * */
+@Data
+public class CouponReceiveVo {
+ /**瑙勫垯鏍囪瘑*/
+ private String id;
+ /**瑙勫垯鍚嶇О*/
+ private String name;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
index 9e1e718..b9838b2 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
@@ -59,21 +59,5 @@
public ReturnVisitListItemVo() {
}
- public ReturnVisitListItemVo(Map<String,Object> visitRecord) {
- this.id = visitRecord.get("id").toString();
- this.timeoutStatus = MapUtil.getInt(visitRecord,"timeoutStatus");
- this.returnVisitStatus = MapUtil.getInt(visitRecord,"returnVisitStatus");
- this.shopId = MapUtil.getString(visitRecord,"shopId");
- this.shopName = MapUtil.getString(visitRecord,"shopName");
- this.returnVisitType = MapUtil.getString(visitRecord,"returnVisitType");
- this.returnVisitTypeName = MapUtil.getString(visitRecord,"returnVisitTypeName");
- this.visitResultStatus = MapUtil.getInt(visitRecord,"visitResultStatus");
- this.satisfiedStatus = MapUtil.getInt(visitRecord,"satisfiedStatus");
- this.corpName = MapUtil.getString(visitRecord,"corpName");
- this.corpId = MapUtil.getString(visitRecord,"corpId");;
- this.content = MapUtil.getString(visitRecord,"content");
- this.remark = MapUtil.getString(visitRecord,"remark");
- this.createPersonName = MapUtil.getString(visitRecord,"createPersonName");;
- }
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
index 477e141..6d22feb 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
@@ -38,6 +38,8 @@
private String memberNO;
/**鎵嬫満鍙�*/
private String tel;
+ /**鐢ㄦ埛澶栭儴鑱旂郴浜虹紪鍙�*/
+ private String externalUserId;
/**娓犻亾鏉ユ簮*/
private String channelType;
--
Gitblit v1.8.0