From 91ee143c5d14a46923a67cf017cf4f64b90860aa Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 12 七月 2024 10:23:45 +0800 Subject: [PATCH] Merge branch 'master-base' into master-jiayan --- phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 5 +++++ phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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 99fbe70..0d28248 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 @@ -13,6 +13,11 @@ */ @Data public class PayAmountDto { + /**鏄惁宸叉彁鍓嶆墸鍙�,渚嬪鎷煎洟璁㈠崟鍏堟墸鍙�,鍚庣画缁撹处涓嶇敤鍐嶆墸鍑�*/ + private Boolean isPay = false; + /**宸叉彁鍓嶆墸鍙栫殑璁板綍鏍囪瘑*/ + private String isPayId; + /**蹇呭~ 瀹為檯鏀粯閲戦*/ private BigDecimal amount; /**蹇呭~ 鏀粯鏂瑰紡*/ diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java index 9f92d0c..4ac4119 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java @@ -36,18 +36,21 @@ /**鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿0 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙�*/ private int opType; - /**N-鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�)*/ + /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�),濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栫殑閲戦鍏宠仈鏁版嵁涔熷瓨鍦ㄨ繖*/ private String commonId; /**N-鏉ユ簮绫诲瀷-涓嶅~榛樿璁㈠崟*/ private String orderType = ORDER_TYPE_ORDER; - /**璁㈠崟id*/ + /**璁㈠崟id,濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栭噾棰濆瓨鐨勬槸鏈悓姝ヨ繃鏉ョ殑鍗曟爣璇�*/ private String orderId; /**璁㈠崟缂栧彿*/ private String orderNo; /**瀛愬崟璁㈠崟id*/ private String orderItemId; + /**鍞竴鏍囪瘑,澶氭潯鎿嶄綔璁板綍鐢ㄥ埌UserMoneyReturnVo杩斿洖璇ヤ紶鍊�*/ + private String equId; + /**澶囨敞*/ private String remarks; -- Gitblit v1.8.0