From c06c38ce579264ef82430b9e2f353afa97e6cafa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 28 十二月 2024 09:51:57 +0800
Subject: [PATCH] 通信中间件统计农户日用水量数据中增加次数属性，数据库中也相应增加此字段。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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..ebf1b55 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
@@ -12,7 +12,6 @@
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -53,9 +52,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);
@@ -77,15 +76,15 @@
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoReversal po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add(@RequestBody @Valid DtoReversal po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱鍦板潃
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犲啿姝ｄ娇鐢級
* cardBalance 鍗＄墖浣欓
* systemBalance 绯荤粺浣欓
* remarks 澶囨敞
@@ -93,8 +92,8 @@
* reversalTime 鍐叉
*/
Long cardId = 0L;
- String cardNum = po.getCardNum();
- String clientNum = "";
+ Long cardNum = po.getCardNum();
+ Long clientId = 0L;
Float cardBalance = po.getCardBalance();
Float systemBalance = po.getSystemBalance();
String remarks = po.getRemarks();
@@ -109,7 +108,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 +118,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 +129,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