From a4636611b429e84fc6abef44dcd005cee69b1858 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 11 九月 2024 15:35:43 +0800
Subject: [PATCH] 2024-09-11 朱宝民 获取图片验证码接口转移到App模块下
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 7fb7ae2..5daf122 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -11,6 +11,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.pojoSe.SeManagerCard;
+import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
@@ -57,6 +58,9 @@
@Autowired
private SeManagerCardMapper seManagerCardMapper;
+
+ @Autowired
+ private SePaymentMethodMapper sePaymentMethodMapper;
@Value("${project.projectNo}")
private Integer projectNo;
@@ -195,11 +199,20 @@
* 琛ュ崱鏃堕棿
* 鏈�鍚庢搷浣滅被鍨�-2
*/
+
+ // 鏍规嵁鏀粯鏂瑰紡ID鑾峰彇鏀粯鏂瑰紡鍚嶇О
+ SePaymentMethod sePaymentMethod = sePaymentMethodMapper.selectByPrimaryKey(paymentId);
+ String paymentName = sePaymentMethod.getName();
+
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
seClientCard.setMoney(afterRecharge);
seClientCard.setRechargedt(rechargeTime);
- seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
+ if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
+ }else {
+ seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
+ }
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
@@ -214,7 +227,11 @@
seCardOperate.setMoney(money);
seCardOperate.setTradeAmount(amount);
seCardOperate.setGift(gift);
- seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
+ if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
+ }else {
+ seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
+ }
seCardOperate.setPaymentId(paymentId);
seCardOperate.setPrice(price);
seCardOperate.setRemarks(remarks);
@@ -228,7 +245,6 @@
}
Map map_response = new HashMap();
-// map_response.put("projectNo", String.format("%02x", Integer.parseInt(getProjectNo())));
map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
--
Gitblit v1.8.0