From 9fd656ba2920feb9ab051b4ef12cdfc649b3136a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 七月 2024 14:16:21 +0800
Subject: [PATCH] 2024-07-26 朱宝民 监测控制模块及小程序模块下定时关阀接口和定量关阀接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
index 300456f..051ddab 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
@@ -8,10 +8,11 @@
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.pojoSe.SeLoss;
import com.dy.pipIrrGlobal.voSe.VoLoss;
+import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
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;
@@ -25,11 +26,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -56,9 +53,9 @@
schema = @Schema(implementation = VoLoss.class))}
)
})
- @GetMapping(path = "/getLosses", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
- public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ @GetMapping(path = "/getLosses")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(QueryVo vo){
try {
QueryResultVo<List<VoLoss>> res = lossSv.getLosses(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -79,17 +76,16 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoLoss po, @Parameter(hidden = true) BindingResult bindingResult){
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ @SsoAop()
+ public BaseResponse<Boolean> add(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
- * cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛�
- * cardAddr 姘村崱鍦板潃
- * clientId 鍐滄埛缂栧彿
+ * cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
+ * cardNum 姘村崱缂栧彿
* money 浣欓
* refund 閫�娆鹃噾棰�
* remarks 澶囨敞
@@ -97,8 +93,8 @@
* lossTime 鎸傚け鏃堕棿
*/
Long cardId = 0L;
- String cardAddr = po.getCardAddr();
- Long clientId = po.getClientId();
+ Long cardNum = po.getCardNum();
+ Long clientId = 0L;
Float money = po.getMoney();
Float refund = po.getRefund();
String remarks = po.getRemarks();
@@ -106,12 +102,14 @@
Date lossTime = new Date();
/**
- * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛堜富閿級
+ * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
- cardId = Optional.ofNullable(clientCardSv.getCardIdByAddr(cardAddr)).orElse(0L);
- if(cardId == 0) {
- return BaseResponseUtils.buildFail("鍗″彿閿欒锛岃鍗′笉瀛樺湪");
+ Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
+ if(map == null || map.size() <= 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
+ cardId = Long.parseLong(map.get("cardId").toString());
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -120,17 +118,21 @@
*/
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
+ seClientCard.setMoney(money);
seClientCard.setLossdtdt(lossTime);
+ seClientCard.setState(CardStateENUM.LOSS.getCode());
seClientCard.setLastoper(LastOperateENUM.LOSS.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
- return BaseResponseUtils.buildFail("鎸傚け澶辫触-鍐滄埛鍗℃寕澶卞紓甯�");
+ return BaseResponseUtils.buildFail(SellResultCode.LOSS_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
* 娣诲姞鎸傚け璁板綍
*/
SeLoss seLoss = new SeLoss();
+ //seLoss.setCardnum(cardNum);
+ //seLoss.setClientnum(clientNum);
seLoss.setCardid(cardId);
seLoss.setClientid(clientId);
seLoss.setMoney(money);
@@ -140,7 +142,7 @@
seLoss.setOperatedt(lossTime);
Long rec = Optional.ofNullable(lossSv.add(seLoss)).orElse(0L);
if(rec == 0) {
- return BaseResponseUtils.buildFail("鎸傚け澶辫触-鎸傚け璁板綍鍐欏叆寮傚父");
+ return BaseResponseUtils.buildFail(SellResultCode.LOSS_FAIL_WRITE_LOSS_ERROR.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
--
Gitblit v1.8.0