From 20c442d28638807774aecae8bc41294cb8c2e0b5 Mon Sep 17 00:00:00 2001 From: Andru <769883346@qq.com> Date: 星期四, 04 一月 2024 18:25:18 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java index e05dee0..801c4a6 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java @@ -1,5 +1,7 @@ package com.hz.his.dto.order; +import com.gitee.sunchenbin.mybatis.actable.annotation.Column; +import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant; import lombok.Data; import java.math.BigDecimal; @@ -26,6 +28,8 @@ private String remarks; /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; + /** Y-鑷姩浣滃簾鍒掓墸 0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/ + private Integer deductionCancel = 0; /** 鎿嶄綔浜哄憳宸ユ爣璇�*/ private String operatorId; @@ -44,6 +48,8 @@ private BigDecimal totalIntegral; /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ private BigDecimal refundTotal; + /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal refundIntegral; /** 鍙��娆炬柟寮忛泦鍚� */ private List<OrderPayMethodDto> payMethodList; /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */ @@ -52,6 +58,9 @@ /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭~*/ private Integer platformSource; + /** 鏄惁绗笁鏂归��娆�(0鍚�1鏄�) */ + private Integer isThirdPartyRefund = 1; + /**澶囩敤鍙傛暟*/ //鎬昏鍗曢寤烘爣璇� private String hisOrderId; -- Gitblit v1.8.0