From 130b710185498fe37c473750d9782a4b009abbbd Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 01 九月 2022 16:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDetailDt.java | 100 +++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java | 30 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java | 5 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 6 +-
4 files changed, 137 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java
index dfb62c1..0e4eb85 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java
@@ -32,5 +32,8 @@
private Integer isSendSMS;
/**鏁伴噺鍙戦�佷紭鎯犲埜鏁伴噺*/
private Integer amount;
-
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index b6315ad..b99a9f7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -6,7 +6,7 @@
import java.util.List;
/**
- * Created with IntelliJ IDEA.
+ * 寮�鍗曞弬鏁癉to
*
* @Author: zhouxiang
* @Date: 2022/08/31/10:32
@@ -21,9 +21,9 @@
//鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭～
private String shopId;
//鎬昏鍗曚俊鎭紝蹇呭～
- private OrdersTotalDto ordersTotal;
+ private OrdersTotalDto orderTotal;
//涓�绾у瓙璁㈠崟锛屽繀濉�
private List<OrderItemDto> orderItem;
//寮�鍙戜汉闆嗗悎
- private OrderDeveloperDto orderDeveloper;
+ private List<OrderDeveloperDto> orderDeveloper;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
new file mode 100644
index 0000000..8b02b47
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.sync;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author
+ */
+@FeignClient(name="synchro-service",path = "/his_synchro",contextId = "synchro-project")
+public interface SyncProjectService {
+
+ /**
+ * 鏂板椤圭洰鍒嗙被
+ * @param jsonObject
+ * @return
+ */
+ @GetMapping(value = "/sync/project/add/service/tree")
+ Result addServiceTree(@RequestBody JSONObject jsonObject);
+
+ /**
+ * 淇敼
+ * @param jsonObject
+ * @return
+ */
+ @GetMapping(value = "/sync/project/update/service/tree")
+ Result updateServiceTree(@RequestBody JSONObject jsonObject);
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDetailDt.java
new file mode 100644
index 0000000..c0068dd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDetailDt.java
@@ -0,0 +1,100 @@
+package com.hz.phis.dt.coupon;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import com.hz.phis.dt.limit.LimitDt;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浼樻儬鍒歌鎯呰繑鍥炲疄浣�
+ *
+ * @author fwq
+ */
+@Data
+public class CouponDetailDt {
+ /**鏍囪瘑*/
+ private String id;
+ /**浼樻儬鍒告爣棰�*/
+ private String title;
+ /**鎻忚堪*/
+ private String describeInfo;
+ /**鏄惁涓婃灦*/
+ private Integer isUp;
+ /**浣跨敤椤荤煡*/
+ private String useKnowInfo;
+ /**娉ㄦ剰浜嬮」*/
+ private String carefulInfo;
+ /**浣跨敤绫诲瀷*/
+ private Integer useType;
+ /**椤圭洰浣跨敤绫诲瀷锛�0鎸囧畾椤圭洰锛�1椤圭洰閫氱敤锛�*/
+ private Integer useProjectType;
+ /**鍟嗗搧浣跨敤绫诲瀷锛�2鎸囧畾鍟嗗搧锛�3鍟嗗搧閫氱敤锛�*/
+ private Integer useGoodsType;
+ /**淇冮攢浣跨敤绫诲瀷锛�-1鍙栨秷,8鎸囧畾淇冮攢锛�9淇冮攢閫氱敤锛�*/
+ private Integer usePromotionType;
+ /**鍗￠」浣跨敤绫诲瀷锛�-1鍙栨秷,10鎸囧畾鍗￠」锛�11鍗￠」閫氱敤锛�*/
+ private Integer useCardType;
+ /**鍥㈣喘鍟嗗搧浣跨敤绫诲瀷锛�4鎸囧畾鍟嗗搧锛�5鍟嗗搧閫氱敤锛�*/
+ private Integer commodityType;
+ /**绉垎鍟嗗搧浣跨敤绫诲瀷锛�6鎸囧畾鍟嗗搧锛�7鍟嗗搧閫氱敤锛�*/
+ private Integer integralType;
+ /**鏄惁灞曠ず*/
+ private Integer isShow;
+ /**灞曠ず寮�濮嬫椂闂�*/
+ private String startShowTime;
+ /**灞曠ず缁撴潫鏃堕棿*/
+ private String endShowTime;
+ /**鏉′欢绫诲瀷*/
+ private Integer conditionType;
+ /**婊¤冻閲戦(鍏�)锛堟弧瓒宠閲戦渚垮彲鐢級*/
+ private BigDecimal amountSatisfied;
+ /**婊¤冻浠舵暟锛堟弧瓒宠鍟嗗搧浠舵暟渚垮彲鐢�,鏆傛椂棰勭暀锛�*/
+ private Integer itemNum;
+ /**浼樻儬绫诲瀷*/
+ private Integer type;
+ /**浼樻儬閲戦(鍏�)*/
+ private BigDecimal discountAmount;
+ /**浼樻儬鎶樻墸*/
+ private Double discountNum;
+ /**璁℃椂绫诲瀷*/
+ private Integer timeType ;
+ /**鍙犲姞鏃堕暱锛堝勾锛�*/
+ public Integer yearNum ;
+ /**鍙犲姞鏃堕暱锛堟湀锛�*/
+ public Integer monthNum ;
+ /**鍙犲姞鏃堕暱锛堟棩锛�*/
+ public Integer dayNum ;
+ /**鍙犲姞鏃堕暱锛堝皬鏃讹級*/
+ public Integer hoursNum ;
+ /**鏈夋晥寮�濮嬫椂闂�*/
+ private String startTime;
+ /**鏈夋晥缁撴潫鏃堕棿*/
+ private String endTime;
+ /**鏄惁鑳戒娇鐢ㄥ鍊奸噾*/
+ private Integer isIncrement;
+ /**鎺掑簭*/
+ private Integer sortNum;
+ /**鍘熶环*/
+ private BigDecimal originalPrice;
+ /**鐜颁环*/
+ private BigDecimal price;
+ /**鏈夋晥鐘舵�侊紙0浣滃簾 1鏈夋晥锛�*/
+ private Integer validState;
+ /**鑹惧績浼氫紭鎯犲埜鏍囪瘑,鑽ｇ埛鍜屾鎮﹁his浼樻儬鍒稿拰crm浼樻儬鍒镐竴涓�瀵瑰簲鍏崇郴*/
+ private String crmCouponId;
+ /**鑹惧績浼氫紭鎯犲埜鍚嶇О*/
+ private String crmCouponName;
+ /**骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,榛樿p-his)*/
+ private String platformType;
+ /**鏄惁鐢熸棩鍒�(0:鍚�,1:鏄�)*/
+ private Integer isBirthday;
+ /**鐢熸棩鍒哥瓑绾ч檺鍒�(澶氫釜鐢ㄩ�楀彿闅斿紑)*/
+ private String birthdayLevel;
+}
--
Gitblit v1.8.0