From 8619c18057012ddf6b6d99c150920ee694c0a5b9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 12 九月 2024 20:43:11 +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/cardOperate/CardOperateCtrl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index ba2542c..4eb7374 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -7,7 +7,6 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.pojoSe.SeManagerCard;
@@ -64,6 +63,7 @@
private Integer projectNo;
/**
* 寮�鍗�
+ * 褰撳崱鐗囪垂鐢ㄤ负0鏃跺嵆涓烘崲鍗℃搷浣滐紝涓嶆敹鍗＄墖璐圭敤锛屼笉鏀朵綑棰�
* @param po 寮�鍗′紶鍏ュ璞�
* @param bindingResult
* @return 姘村崱缂栧彿
@@ -143,7 +143,14 @@
seClientCard.setOriginalCardId(originalCardId);
}
seClientCard.setCreatedt(activeTime);
- seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ if(cardCost == 0) {
+ // 鎹㈠崱
+ seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
+ }else {
+ // 寮�鍗�
+ seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ }
+ //seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
if(cardId == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
@@ -162,8 +169,12 @@
// 琛ュ崱
seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
}else {
- // 寮�鏂板崱
- seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ // 寮�鏂板崱鎴栨崲鍗�
+ if(cardCost > 0) {
+ seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ }else {
+ seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
+ }
}
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
@@ -848,21 +859,11 @@
* @param vo
* @return
*/
- @Operation(summary = "鑾峰緱浜ゆ槗璁板綍鏄庣粏", description = "杩斿洖浜ゆ槗璁板綍鏄庣粏")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = BaClient.class))}
- )
- })
@GetMapping(path = "getTransactions")
@SsoAop()
public BaseResponse<Map> getOperates(QoTransaction vo){
try {
- Map res = cardOperateSv.getTransactions(vo);
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(cardOperateSv.getTransactions(vo));
} catch (Exception e) {
log.error("鏌ヨ浜ゆ槗璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
--
Gitblit v1.8.0