From b65cbfb8452a95575f0dc637b55ed49f058597fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 20 八月 2024 21:02:21 +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/cancel/CancelCtrl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
index 726052e..d686fbb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
@@ -8,11 +8,11 @@
import com.dy.pipIrrGlobal.pojoSe.SeCancel;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voSe.VoCancel;
+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;
@@ -54,9 +54,9 @@
schema = @Schema(implementation = VoCancel.class))}
)
})
- @GetMapping(path = "/getCancels", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getCancels")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoCancel>>> getCancels(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoCancel>>> getCancels(QueryVo vo){
try {
QueryResultVo<List<VoCancel>> res = cancelSv.getCancels(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -78,7 +78,7 @@
@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 DtoCancel po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add(@RequestBody @Valid DtoCancel po, BindingResult bindingResult){
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -86,8 +86,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱缂栧彿
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犳敞閿�浣跨敤锛�
* refund 閫�娆鹃噾棰�
* refundType 閫�娆炬柟寮�
* remarks 澶囨敞
@@ -95,8 +95,8 @@
* cancelTime 鎸傚け鏃堕棿
*/
Long cardId = 0L;
- String cardNum = po.getCardNum();
- String clientNum = "";
+ Long cardNum = po.getCardNum();
+ Long clientId = 0L;
Float refund = po.getRefund();
Byte refundType = po.getRefundType();
String remarks = po.getRemarks();
@@ -111,16 +111,18 @@
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());
/**
* 淇敼鍐滄埛鍗′俊鎭細
- * 鎸傚け鏃堕棿
+ * 娉ㄩ攢鏃堕棿
* 鏈�鍚庢搷浣滅被鍨�-4
*/
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
seClientCard.setCanceldt(cancelTime);
+ seClientCard.setMoney(0f);
+ seClientCard.setState(CardStateENUM.CANCELLED.getCode());
seClientCard.setLastoper(LastOperateENUM.CANCEL.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
@@ -128,11 +130,13 @@
}
/**
- * 娣诲姞鎸傚け璁板綍
+ * 娣诲姞娉ㄩ攢璁板綍
*/
SeCancel seCancel = new SeCancel();
- seCancel.setCardnum(cardNum);
- seCancel.setClientnum(clientNum);
+ //seCancel.setCardnum(cardNum);
+ //seCancel.setClientnum(clientNum);
+ seCancel.setCardid(cardId);
+ seCancel.setClientid(clientId);
seCancel.setRefund(refund);
seCancel.setRefundtype(refundType);
seCancel.setRemarks(remarks);
--
Gitblit v1.8.0