From d288633938a13fe59901be5cf5946a4dfd420377 Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期一, 08 五月 2023 10:10:24 +0800 Subject: [PATCH] Merge branch 'master-prod-new' --- phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 7 ++++--- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 7 +++++++ phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java | 21 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java index 1de6fbf..720798c 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java @@ -25,11 +25,12 @@ private String userInviteeName; /**鎵�灞炲挩璇㈠笀*/ private String userCorpUserName; - /**鎵�灞為棬搴�*/ - private String userShopName; /**鍟嗗搧鍚嶇О*/ private String goodsName; - + /**璁㈠崟鎵�灞為棬搴�*/ + private String shopId; + /**瀹㈡埛鎵�灞為棬搴�*/ + private String userShopId; /*******淇濆瓨鍙傛暟********/ /**鎿嶄綔浜烘爣璇�*/ diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java index 3b66134..a76d5a6 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java @@ -2,6 +2,7 @@ import com.hx.resultTool.Result; import com.hz.his.dto.user.money.PhisUserMoneyDto; +import com.hz.his.dto.user.money.UserMoneyDto; import com.hz.his.dto.user.money.UserMoneyUpdateDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -25,4 +26,10 @@ @PostMapping(value = "/user/money/unclaimed/add") Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto); + /** + * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅 + */ + @PostMapping(value = "/user/money/info") + Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto); + } \ No newline at end of file diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java new file mode 100644 index 0000000..b74061a --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java @@ -0,0 +1,21 @@ +package com.hz.his.vo.order.refund; + +import lombok.Data; + +/** + * 浣滃簾閫�娆惧疄浣撶粨鏋� + * @author CJH + */ +@Data +public class RefundCancelVo { + + /**閫�娆惧崟鏍囪瘑-蹇呭~*/ + private String id; + /**浣滃簾澶囨敞-蹇呭~*/ + private String remarks; + /**鎿嶄綔鍛樺伐-蹇呭~*/ + private String staffId; + /**鎿嶄綔鍛樺伐瑙掕壊-蹇呭~*/ + private String staffRoleId; + +} -- Gitblit v1.8.0