From 7987fd29be9bc08a36b949aa18b3703fb91759a5 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 31 八月 2022 14:54:23 +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/order/CardItemInfoDto.java | 19 ++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 6 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 24 ++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 11 +-
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java | 17 +++-
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java | 90 ++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 36 ++++----
9 files changed, 181 insertions(+), 29 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/dto/order/CardItemInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
new file mode 100644
index 0000000..5b7716f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.order;
+
+/**
+ * 鍗￠」缁勫悎椤圭洰(card_item_info)
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/08/31/11:18
+ * @Description:
+ */
+public class CardItemInfoDto {
+ /**
+ * 浣跨敤娆℃暟
+ */
+ private Integer userNum;
+ /**
+ * 瀹㈡埛鍗″寘閫夊畾椤圭洰:(鍗￠」鐨勭粍鍚堥」鐩爣璇�)
+ */
+ private String id;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 9723a3f..53ec72a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -23,11 +23,11 @@
private String activityId;
/** 娲诲姩瑙勫垯鍚嶇О */
private String activityName;
- /** 鏄惁鏁村崟鎶樻墸 */
+ /** 鏄惁鏁村崟鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isWholeDiscount;
- /** 鏄惁鍛樺伐鎶樻墸 */
+ /** 鏄惁鍛樺伐鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isEmployeeDiscount;
- /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) */
+ /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) 蹇呭～锛岄粯璁�100*/
private BigDecimal discount;
/** 鍒掓墸鐜伴噾鎬婚噾棰�(浣滅敤:鐢ㄦ潵璁＄畻鍒掓墸椤圭洰鐨勬墽琛岄噾棰�,鏀粯鏂瑰紡鏄幇閲戞敮浠樼殑鎬婚噾棰�) */
private BigDecimal snapPayTotal=BigDecimal.ZERO;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
index b8a3c95..b412caf 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* 璁㈠崟淇℃伅
@@ -16,7 +17,7 @@
/** 璁㈠崟缂栧彿锛屼互SO锛夊紑澶�, SOyyyyMMdd0000000 */
private String orderNo;
- /** 鍟嗗搧绫诲瀷(OrderItemConstants) */
+ /** 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, 蹇呭～*/
private String type;
/** 椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜 */
@@ -51,24 +52,27 @@
/** 椤圭洰/鍟嗗搧鐤楃▼鍗曟鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */
private Integer single;
- /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) */
+ /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100*/
private BigDecimal discount;
/** 鎬绘鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */
private Integer usedTotal;
- /** 璐拱鏁伴噺 */
+ /** 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
/** 瀛愰」璁㈠崟澶囨敞 */
private String remarks;
- /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 */
+ /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭～*/
private String commonId;
/** 鎵ц鏉＄洰ID */
private String performId;
/** 璁㈠崟id锛圤rdersTotal锛� */
private String orderId;
+
+ /** 鍗″寘鏍囪瘑锛圲serCard锛� */
+ private String userCardId;
/** 杞叆闂ㄥ簵id */
private String transferIntoShopId;
@@ -83,9 +87,12 @@
private Integer isTurn;
/** 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,crm榛樿crm) */
private String platformType=TYPE_PLATFORM_CRM;
- /** 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id */
+ /** 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭～*/
private String platformTypeId;
+ /** 鍗″寘鏍囪瘑 */
+ private List<CardItemInfoDto> cardItemInfoIds;
+
/**骞冲彴绫诲瀷-CRM*/
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
new file mode 100644
index 0000000..fdd9d01
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * Created with IntelliJ IDEA.
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/08/31/10:32
+ * @Description:
+ */
+@Data
+public class OrderPHisDto extends PageDto {
+ //type:0:鑽夌 1:鎻愪氦 2:缁撹处,crm濉�2锛屽繀濉�
+ private String type;
+ //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鍚庣澶勭悊锛岃幏鍙栧綋鍓嶇櫥褰曚汉鏍囪瘑,crm濉敤鎴凤紝蹇呭～
+ private String operatorId;
+ //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭～
+ private String shopId;
+ private OrdersTotalDto ordersTotal;
+ private OrderItemDto orderItem;
+ private OrderDeveloperDto orderDeveloper;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
index 9ab54ce..87a9b9d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
@@ -19,7 +19,7 @@
private String id;
/** 璁㈠崟缂栧彿锛屼互S寮�澶�, SyyyyMMdd0000000(鍓嶇紑浠庡瓧鍏歌幏鍙�) */
private String orderNo;
- /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛� */
+ /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, 蹇呭～*/
private String type;
/** 鐘舵��(OrderTotalConstants) */
private Integer status;
@@ -77,36 +77,38 @@
/** 涓嬪崟鎿嶄綔浜哄悕绉� */
private String operatorName;
- /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+ /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) 蹇呭～*/
private String developerShopId;
/** 寮�鍙戜汉闂ㄥ簵鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
private String developerShopName;
- /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) */
+ /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 蹇呭～锛屼笁灏戣锛宑rm灏卞～鐢ㄦ埛*/
private String developerId;
- /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) */
+ /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 蹇呭～锛屼笁灏戣锛宑rm灏卞～鐢ㄦ埛*/
private String developerName;
/*骞冲彴鏉ユ簮**/
- /** 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+ /** 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) 蹇呭～*/
private String appId;
- /** 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～) */
+ /** 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～) 蹇呭～*/
private String appIdCode;
/*閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨*/
- /** 璁㈠崟鏉ユ簮浠ｇ爜锛堥粯璁�:搴旂敤appId锛� */
+ /** 璁㈠崟鏉ユ簮浠ｇ爜锛堥粯璁�:搴旂敤appId锛�
+ * 閿�鍞钩鍙扮紪鐮�,渚嬪:娣樺疂,鍦ㄧ數鍟嗗钩鍙拌缃噷闈紝鍦ㄧ涓夋柟骞冲彴閰嶇疆,蹇呭～,crm榛樿濉玞rm
+ * */
private String sourceCode;
- /** 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) */
+ /** 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,蹇呭～锛宺m榛樿濉玞rm*/
private String sourceName;
- /** 绗笁鏂硅鍗曞彿 */
+ /** 绗笁鏂硅鍗曞彿 crm蹇呭～锛屽～crm鐨勮鍗曞彿*/
private String sourceOrderNo;
/** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
private String conversionCode;
- /** 娓犻亾鏉ユ簮绫诲瀷锛圤rderTotalConstants锛� */
+ /** 璁㈠崟娓犻亾鏉ユ簮绫诲瀷锛圤rderTotalConstants锛� */
private String channelType;
- /** 娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛� */
+ /** 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛� crm蹇呭～锛屼笁灏戣 */
private String commonId;
- /** 娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
+ /** 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
private String commonName;
/** 绉戝缂栫爜 */
@@ -124,7 +126,7 @@
/** 鍖荤敓鍚嶇О */
private String doctorName;
- /** 鍚屾鐘舵��0鍚�1鏄� */
+ /** 鍚屾鐘舵��0鍚�1鏄� ,蹇呭～锛屽鏋滆鍚屾鍒伴寤哄繀濉�1锛屽惁鍒�0*/
private int hisSynStatus;
/** 鍚屾his璁㈠崟鍙� */
private String hisOrderId;
@@ -149,16 +151,16 @@
/** 璁㈠崟澶囨敞 */
private String remarks;
- /** 鎺ㄨ崘浜烘爣璇� */
+ /** 璁㈠崟鎺ㄨ崘浜烘爣璇� crm蹇呭～锛屼笁灏戣*/
private String inviteeId;
- /** 鎺ㄨ崘浜哄悕绉�(鍐椾綑) */
+ /** 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑) crm蹇呭～锛屼笁灏戣*/
private String inviteeName;
- /** 鎺ㄨ崘浜烘墍灞炵被鍨�(UserChannelType) */
+ /** 璁㈠崟鎺ㄨ崘浜烘墍灞炵被鍨�(UserChannelType) */
private String userBelongingType;
- /** 鐢ㄦ埛Id */
+ /** 鐢ㄦ埛Id 蹇呭～*/
private String userId;
/** 鍚屾鐘舵��(OrderTotalConstants) */
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);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index a7bc22f..5f4993b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -1,10 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.order.OrderCreateDto;
-import com.hz.his.dto.order.OrderPayDto;
-import com.hz.his.dto.order.OrderRefundDto;
-import com.hz.his.dto.order.OrdersTotalDto;
+import com.hz.his.dto.order.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -51,4 +48,10 @@
*/
@PostMapping(value = "/refund/syn/refund")
Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
+ /**
+ * 寮�鏀惧钩鍙�-寮�鍗曞苟涓旂粨璐︽帴鍙�
+ */
+ @PostMapping(value = "/create/pay/order")
+ Result createPayOrder(@RequestBody OrderPHisDto dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index daa96e5..757737e 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -61,4 +61,10 @@
private String hisCorpUser;
/**鎬у埆*/
private Integer gender;
+ /**鑱屼笟绫诲瀷鍚嶇О*/
+ private String professionTypeName;
+ /**寰俊鍙�*/
+ private String wechat;
+ /**閭*/
+ private String email;
}
--
Gitblit v1.8.0