From 510f7d6706d9903cabb10f851466664e09a2996c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 二月 2024 16:11:46 +0800
Subject: [PATCH] 1.修改

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)

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..210a568 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,48 @@
  */
 @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
+    /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭~锛岄��娆句娇鐢�) */
+    private String opRoleId;
+
+    /**鏀粯鐢ㄦ埛*/
+    private String payUserId;
+
+    /**闈炲繀濉� 浼樻儬鍒竔d*/
     private String userCouponId;
-    //璁㈠崟棰嗗缓鏍囪瘑
+
+    /**闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑*/
     private String hisOrderId;
+    /**闈炲繀濉� 鏀堕摱鍛榠d*/
+    private String cashier;
+
+    /**闈炲繀濉� 鏀堕摱鍛橀棬搴�*/
+    private String cashierShopId;
+    /**浼樻儬鍒告牎楠岀増鏈紙榛樿0锛夌涓�鐗堜负0,闂ㄥ簵鍔╂墜涓婄嚎鐗堟湰涓�1*/
+    private Integer couponCheckVersion = 0;
+    /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
+    private List<String> userCouponIds;
+
+    /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
+    private String orderOCRImageUrl;
+
+    /**绗笁鏂硅鍗曠紪鍙�*/
+    private String otherOrderNo;
+    /**绗笁鏂瑰厬鎹㈢爜*/
+    private String redemptionCode;
+
+    /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+    private Integer directDeduction = 0;
+    /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+    private Integer cardPass = 0;
 }

--
Gitblit v1.8.0