From d52c20ed07bcea2d848bdab25f2c49c21c00d269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 二月 2024 12:56:22 +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/activeCard/ActiveCardCtrl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index 99e7eae..e31783a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -7,7 +7,9 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
@@ -23,7 +25,6 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -48,8 +49,8 @@
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
- @Value("${projectCode.ym}")
- private Integer projectCode;
+ //@Value("${projectCode.ym}")
+ //private Integer projectCode;
/**
* 鑾峰彇寮�鍗¤褰�
@@ -222,7 +223,8 @@
}
Map map = new HashMap();
- map.put("projectCode", projectCode);
+ //map.put("projectCode", projectCode);
+ map.put("projectCode", Constant.projectCode_ym);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
}
@@ -261,7 +263,7 @@
//String clientNum = "";
Long clientId = 0L;
Integer cardCost = po.getCardCost();
- Double reissueAmount = po.getReissueAmount();
+ Float reissueAmount = po.getReissueAmount();
Long paymentId = po.getPaymentId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
@@ -303,7 +305,7 @@
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
activeCard.setReissueamount(reissueAmount);
- activeCard.setOperatetype(OperateTypeENUM.REPLACE.getCode());
+ activeCard.setOperatetype(OperateTypeENUM.REISSUE.getCode());
activeCard.setRemarks(remarks);
activeCard.setOperator(operator);
activeCard.setOperatedt(replaceTime);
--
Gitblit v1.8.0