From 0741bd3541da341a0707d1c365dec3ea98f28c2d Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期四, 01 九月 2022 16:20:24 +0800
Subject: [PATCH] 调整开单参数说明

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java       |   11 +-
 phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java    |    3 
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java       |   10 +-
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisInfoDto.java   |   24 ++++++
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java   |   40 ++++++++++
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java             |   15 ++-
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |   91 ++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java     |    8 +-
 8 files changed, 181 insertions(+), 21 deletions(-)

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
index 5b7716f..ea7148e 100644
--- 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
@@ -1,5 +1,7 @@
 package com.hz.his.dto.order;
 
+import lombok.Data;
+
 /**
  * 鍗¢」缁勫悎椤圭洰(card_item_info)
  *
@@ -7,6 +9,7 @@
  * @Date: 2022/08/31/11:18
  * @Description:
  */
+@Data
 public class CardItemInfoDto {
     /**
      * 浣跨敤娆℃暟
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
new file mode 100644
index 0000000..e69c4b6
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -0,0 +1,40 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * p-his寮�鍗昳tem鍙傛暟
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/09/01/15:45
+ * @Description:
+ */
+@Data
+public class OrderItemPHisDto {
+    /**蹇呭~ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭, */
+    private String type;
+    /**蹇呭~ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100*/
+    private BigDecimal discount;
+    /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/
+    private Integer buyNum;
+    /**蹇呭~ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭~*/
+    private String commonId;
+
+    /**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
+    private String commonItemId;
+    /**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
+    private String bodyPartsId;
+    /**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
+    private String bodyPartsName;
+    /**闈炲繀濉� 鍗″寘鏍囪瘑锛圲serCard锛� */
+    private String userCardId;
+    /**闈炲繀濉� 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭~*/
+    private String platformTypeId;
+
+    /**闈炲繀濉� 鍗″寘鏍囪瘑 */
+    private List<CardItemInfoDto> cardItemInfoIds;
+
+}
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 b99a9f7..34efcb5 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
@@ -14,16 +14,16 @@
  */
 @Data
 public class OrderPHisDto extends PageDto {
-    //type:0:鑽夌 1:鎻愪氦 2:缁撹处,crm濉�2锛屽繀濉�
+    //type:0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处,crm濉�2锛屽繀濉�
     private String type;
-    //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鍚庣澶勭悊锛岃幏鍙栧綋鍓嶇櫥褰曚汉鏍囪瘑,crm濉敤鎴凤紝蹇呭~
+    //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~
     private String operatorId;
     //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~
     private String shopId;
     //鎬昏鍗曚俊鎭紝蹇呭~
-    private OrdersTotalDto orderTotal;
+    private OrdersPHisTotalDto orderTotal;
     //涓�绾у瓙璁㈠崟锛屽繀濉�
-    private List<OrderItemDto> orderItem;
-    //寮�鍙戜汉闆嗗悎
+    private List<OrderItemPHisDto> orderItem;
+    //寮�鍙戜汉闆嗗悎 闈炲繀濉�
     private List<OrderDeveloperDto> orderDeveloper;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisInfoDto.java
new file mode 100644
index 0000000..d877eaa
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisInfoDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * p-his寮�鍗曡鍗昳nfro鍙傛暟
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/09/01/15:43
+ * @Description:
+ */
+@Data
+public class OrderPHisInfoDto {
+    /**蹇呭~ 鏄惁鏁村崟鎶樻墸,榛樿0*/
+    private Integer isWholeDiscount;
+    /**蹇呭~ 鏄惁鍛樺伐鎶樻墸,榛樿0*/
+    private Integer isEmployeeDiscount;
+    /**蹇呭~ 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100),榛樿100*/
+    private BigDecimal discount;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
new file mode 100644
index 0000000..6fd69ed
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -0,0 +1,91 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * p-his寮�鍗曞弬鏁�
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/09/01/15:37
+ * @Description:
+ */
+@Data
+public class OrdersPHisTotalDto {
+    /**蹇呭~ 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭*/
+    private String type;
+
+    /**蹇呭~ 骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+    private String appId;
+    /**蹇呭~ 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠g爜蹇呭~) */
+    private String appIdCode;
+
+    /*蹇呭~ 閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨
+    *      璁㈠崟鏉ユ簮浠g爜锛堥粯璁�:搴旂敤appId锛�
+    *      閿�鍞钩鍙扮紪鐮�,渚嬪:娣樺疂,鍦ㄧ數鍟嗗钩鍙拌缃噷闈紝鍦ㄧ涓夋柟骞冲彴閰嶇疆,蹇呭~,crm榛樿濉玞rm
+    * */
+    private String sourceCode;
+    /**蹇呭~ 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm*/
+    private String sourceName;
+    /**crm蹇呭~ 绗笁鏂硅鍗曞彿,濉玞rm鐨勮鍗曞彿*/
+    private String sourceOrderNo;
+    /** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
+    private String conversionCode;
+
+    /**蹇呭~ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+    private String developerShopId;
+    /**crm蹇呭~ 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 涓夊皯璇达細crm灏卞~鐢ㄦ埛*/
+    private String developerId;
+    /**crm蹇呭~ 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞~鐢ㄦ埛*/
+    private String developerName;
+
+    /**蹇呭~ 鐢ㄦ埛Id */
+    private String userId;
+
+    /**crm蹇呭~ 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛�,涓夊皯璇达細crm蹇呭~ */
+    private String commonId;
+    /**闈炲繀濉� 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
+    private String commonName;
+
+    /**crm蹇呭~ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭~ */
+    private String inviteeId;
+    /**crm蹇呭~ 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭~ */
+    private String inviteeName;
+
+    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0*/
+    private int hisSynStatus;
+
+    /**蹇呭~ 璁㈠崟鍏朵粬淇℃伅*/
+    private OrderInfoDto orderInfo;
+
+    /**鍏呭�艰鍗曞繀濉� 璁㈠崟鎬婚噾棰� */
+    private BigDecimal total;
+
+    /**闈炲繀濉� 璧犻�侀噾棰� */
+    private BigDecimal givingAmount;
+    /**闈炲繀濉� 璧犻�侀噾棰濈被鍨�(GivingAmountType) */
+    private String givingType;
+    /**闈炲繀濉� 缇庡甯堟爣璇� */
+    private String beauticianId;
+    /**闈炲繀濉� 缇庡甯堝悕绉� */
+    private String beauticianName;
+    /**闈炲繀濉� 鍖荤敓鏍囪瘑 */
+    private String doctorId;
+    /**闈炲繀濉� 鍖荤敓鍚嶇О */
+    private String doctorName;
+    /**闈炲繀濉� 绉戝缂栫爜 */
+    private String departmentCode;
+    /**闈炲繀濉� 绉戝鍚嶇О */
+    private String departmentName;
+    /**闈炲繀濉� 棰勭害璁㈠崟鏍囪瘑 */
+    private String appointmentId;
+    /**闈炲繀濉� 搴峰崥浣虫爣璇�(KoapOrderTotal) */
+    private String koapOrderId;
+    /**闈炲繀濉� 璁㈠崟澶囨敞 */
+    private String remarks;
+
+    /**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
+    private List<String> activityIds;
+}
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 87a9b9d..e89eb6f 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锛�,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭, 蹇呭~*/
+    /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�*/
     private String type;
     /** 鐘舵��(OrderTotalConstants) */
     private Integer status;
@@ -77,13 +77,13 @@
     /** 涓嬪崟鎿嶄綔浜哄悕绉� */
     private String operatorName;
 
-    /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) 蹇呭~*/
+    /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
     private String developerShopId;
     /** 寮�鍙戜汉闂ㄥ簵鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
     private String developerShopName;
-    /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 蹇呭~锛屼笁灏戣锛宑rm灏卞~鐢ㄦ埛*/
+    /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑)*/
     private String developerId;
-    /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 蹇呭~锛屼笁灏戣锛宑rm灏卞~鐢ㄦ埛*/
+    /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) */
     private String developerName;
 
 
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 91e40a7..57fc55e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -11,14 +11,15 @@
  */
 @Data
 public class PayAmountDto {
-    //瀹為檯鏀粯閲戦
+    //蹇呭~ 瀹為檯鏀粯閲戦
     private String amount;
-    //鏀粯鏂瑰紡
+    //蹇呭~ 鏀粯鏂瑰紡
     private String method;
-    //鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)
+    //蹇呭~ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)
     private String commonId;
-    //鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶
+
+    //闈炲繀濉� 鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶
     private String cardEquityId;
-    //鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶
+    //闈炲繀濉� 鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶
     private String userCardId;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 2c8e35e..ef3061c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -13,18 +13,19 @@
  */
 @Data
 public class PayDto {
-    //鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�
+    //蹇呭~ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0
     private Integer type;
-    //璁㈠崟id  蹇呭~
+    //蹇呭~ 璁㈠崟id
     private String orderId;
-    //搴斾粯鎬婚噾棰� 蹇呭~
+    //蹇呭~ 搴斾粯鎬婚噾棰�
     private String total;
-    //缁撹处鍙傛暟 蹇呭~
+    //蹇呭~ 缁撹处鍙傛暟
     private List<PayAmountDto> amount;
-    //鎿嶄綔浜烘爣璇� 蹇呭~,crm濉敤鎴�
+    //蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�
     private String operatorId;
-    //浼樻儬鍒竔d
+
+    //闈炲繀濉� 浼樻儬鍒竔d
     private String userCouponId;
-    //璁㈠崟棰嗗缓鏍囪瘑
+    //闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑
     private String hisOrderId;
 }

--
Gitblit v1.8.0