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/loss/LossCtrl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 3e51765..b0a4ab0 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,6 +8,7 @@
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;
@@ -53,9 +54,9 @@
schema = @Schema(implementation = VoLoss.class))}
)
})
- @GetMapping(path = "/getLosses", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getLosses")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(QueryVo vo){
try {
QueryResultVo<List<VoLoss>> res = lossSv.getLosses(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -84,8 +85,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱缂栧彿
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犳寕澶变娇鐢級
* money 浣欓
* refund 閫�娆鹃噾棰�
* remarks 澶囨敞
@@ -94,7 +95,7 @@
*/
Long cardId = 0L;
String cardNum = po.getCardNum();
- String clientNum = "";
+ Long clientId = 0L;
Float money = po.getMoney();
Float refund = po.getRefund();
String remarks = po.getRemarks();
@@ -109,7 +110,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());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -118,7 +119,9 @@
*/
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) {
@@ -129,8 +132,10 @@
* 娣诲姞鎸傚け璁板綍
*/
SeLoss seLoss = new SeLoss();
- seLoss.setCardnum(cardNum);
- seLoss.setClientnum(clientNum);
+ //seLoss.setCardnum(cardNum);
+ //seLoss.setClientnum(clientNum);
+ seLoss.setCardid(cardId);
+ seLoss.setClientid(clientId);
seLoss.setMoney(money);
seLoss.setRefund(refund);
seLoss.setRemarks(remarks);
--
Gitblit v1.8.0