From 857d738b56e4801a07521cfde502bd5c0f2bf132 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
index 9322334..c2705d5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
@@ -53,9 +53,9 @@
schema = @Schema(implementation = VoReversal.class))}
)
})
- @GetMapping(path = "/getReversals", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getReversals")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoReversal>>> getReversals(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoReversal>>> getReversals(QueryVo vo){
try {
QueryResultVo<List<VoReversal>> res = reversalSv.getReversals(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -84,8 +84,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱鍦板潃
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犲啿姝ｄ娇鐢級
* cardBalance 鍗＄墖浣欓
* systemBalance 绯荤粺浣欓
* remarks 澶囨敞
@@ -94,7 +94,7 @@
*/
Long cardId = 0L;
String cardNum = po.getCardNum();
- String clientNum = "";
+ Long clientId = 0L;
Float cardBalance = po.getCardBalance();
Float systemBalance = po.getSystemBalance();
String remarks = po.getRemarks();
@@ -109,7 +109,7 @@
return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
- clientNum = map.get("clientNum").toString();
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -119,6 +119,7 @@
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
seClientCard.setReversaldt(reversalTime);
+ seClientCard.setMoney(cardBalance);
seClientCard.setLastoper(LastOperateENUM.REVERSAL.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
@@ -129,8 +130,10 @@
* 娣诲姞鍐叉璁板綍
*/
SeReversal reversal = new SeReversal();
- reversal.setCardnum(cardNum);
- reversal.setClientnum(clientNum);
+ //reversal.setCardnum(cardNum);
+ //reversal.setClientnum(clientNum);
+ reversal.setCardid(cardId);
+ reversal.setClientid(clientId);
reversal.setCardbalance(cardBalance);
reversal.setSystembalance(systemBalance);
reversal.setRemarks(remarks);
--
Gitblit v1.8.0