From 15e276b0518da45f1281ba9ce9db01d3400ec04e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 八月 2022 14:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 1
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
new file mode 100644
index 0000000..799d2b1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
@@ -0,0 +1,90 @@
+package com.hz.his.dto.coupon;
+
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鐢ㄦ埛浼樻儬鍒歌鎯�
+ * @author cjh
+ */
+@Data
+public class CouponNumberDto{
+ /**鏍囪瘑*/
+ private String id;
+ /**鏍囬*/
+ private String title;
+ /**鏈夋晥寮�濮嬫椂闂�*/
+ private Date startTime;
+ /**鏈夋晥缁撴潫鏃堕棿*/
+ private Date endTime;
+
+ /**浼樻儬绫诲瀷锛�0鎶樻墸锛�1閲戦锛�*/
+ private Integer type = TYPE_DIS;
+
+ /**鏉′欢绫诲瀷锛�0鏃犳潯浠讹紝1婊￠噾棰濓紝2婊′欢鏁�;鏆傛椂棰勭暀锛岄粯璁ゆ弧閲戦锛�*/
+ private Integer conditionType;
+ /**浼樻儬鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿100)*/
+ private BigDecimal discountNum;
+ /**浼樻儬閲戦(鍏�)*/
+ private BigDecimal discountAmount;
+ /**婊¤冻閲戦(鍏�)锛堟弧瓒宠閲戦渚垮彲鐢級*/
+ private BigDecimal amountSatisfied = BigDecimal.ZERO;
+
+ /**鏄惁鑳戒娇鐢ㄥ鍊奸噾,0:涓嶈兘锛�1锛氬彲浠�*/
+ private Integer isIncrement = YES;
+
+ /**椤圭洰浣跨敤绫诲瀷锛�-1鍙栨秷,0鎸囧畾椤圭洰锛�1椤圭洰閫氱敤锛�*/
+ private Integer useProjectType;
+ /**鍟嗗搧浣跨敤绫诲瀷锛�-1鍙栨秷,2鎸囧畾鍟嗗搧锛�3鍟嗗搧閫氱敤锛�*/
+ private Integer useGoodsType;
+ /**淇冮攢浣跨敤绫诲瀷锛�-1鍙栨秷,8鎸囧畾淇冮攢锛�9淇冮攢閫氱敤锛�*/
+ private Integer usePromotionType;
+ /**鍗￠」浣跨敤绫诲瀷锛�-1鍙栨秷,10鎸囧畾鍗￠」锛�11鍗￠」閫氱敤锛�*/
+ private Integer useCardType;
+ /**鍥㈣喘鍟嗗搧浣跨敤绫诲瀷锛�4鎸囧畾鍟嗗搧锛�5鍟嗗搧閫氱敤锛�*/
+ private Integer commodityType = -1;
+ /**绉垎鍟嗗搧浣跨敤绫诲瀷锛�6鎸囧畾鍟嗗搧锛�7鍟嗗搧閫氱敤锛�*/
+ private Integer integralType = -1;
+
+ /**鎻忚堪*/
+ private String describeInfo;
+
+ /**璁℃椂绫诲瀷锛�0鏃堕棿娈碉紝1棰嗗彇鏈夋晥鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級锛�2鏃犳晥鏃堕暱锛�*/
+ private Integer timeType;
+
+ /**璁℃椂绫诲瀷-鏃堕棿娈�*/
+ public static final int TIME_TYPE_SLOT = 0;
+ /**璁℃椂绫诲瀷-棰嗗彇鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級*/
+ public static final int TIME_TYPE_HOURS = 1;
+ /**璁℃椂绫诲瀷-鏃犻檺鏃堕暱*/
+ public static final int TIME_TYPE_ALL = 2;
+
+ /**鏉′欢绫诲瀷-鏃犳潯浠�*/
+ public static final int COND_TYPE_NOT = 0;
+ /**鏉′欢绫诲瀷-閲戦*/
+ public static final int COND_TYPE_MONEY = 1;
+ /**鏉′欢绫诲瀷-浠舵暟*/
+ public static final int COND_TYPE_ITEM = 2;
+
+ /**浼樻儬绫诲瀷-鍙栨秷*/
+ public static final int TYPE_CANCEL = -1;
+ /**浼樻儬绫诲瀷-鎶樻墸*/
+ public static final int TYPE_DIS = 0;
+ /**浼樻儬绫诲瀷-閲戦*/
+ public static final int TYPE_AMOUNT = 1;
+ /**浼樻儬绫诲瀷-鏉冪泭鍟嗗搧鎶垫墸*/
+ public static final int TYPE_SERVICE = 2;
+
+ /**鏁板瓧0*/
+ public static final int NO = 0;
+ /**鏁板瓧1*/
+ public static final int YES = 1;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 90980cf..7c8fe90 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -127,6 +127,7 @@
/**
* 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
+ * 杞寲浣跨敤 CouponNumberDto
*/
@PostMapping(value = "/order/can/use/coupon")
Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto);
--
Gitblit v1.8.0