From 06d79b2339046e2028bb32f72b93d729e1130523 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 05 十一月 2024 15:45:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 26 ++++++++++++++++++++------
1 files changed, 20 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 745991c..2121d22 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
@@ -5,15 +5,18 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
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;
import com.dy.pipIrrSell.recharge.DtoRecharge;
import com.dy.pipIrrSell.recharge.RechargeCtrl;
+import com.dy.pipIrrSell.recharge.RechargeSv;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -47,6 +50,9 @@
private final ActiveCardSv activeCardSv;
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
+ private final RechargeSv rechargeSv;
+ private final BaSettingsMapper baSettingsMapper;
+
//@Value("${projectCode.ym}")
//private Integer projectCode;
@@ -208,7 +214,7 @@
/**
* 濡傛灉鎿嶄綔浜哄憳寮�鍗℃椂杈撳叆浜嗗厖鍊奸噾棰濓紝鍒欏紑鍗″悗璋冪敤鍏呭�煎姛鑳�
*/
- po.setCardNum(cardNum);
+ po.setCardNum(Long.parseLong(cardNum));
if(amount != null && amount > 0) {
po.setClientId(clientId);
DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po);
@@ -222,8 +228,16 @@
}
Map map = new HashMap();
- //map.put("projectCode", projectCode);
- map.put("projectCode", Constant.projectCode_ym);
+ if(amount != null && amount > 0) {
+ Long rechargeId = rechargeSv.selectIdByCardId(cardId);
+ map.put("orderNumber",rechargeId+"");//杩斿洖鍏呭�糏D
+ }else {
+ map.put("orderNumber",rec+"");//杩斿洖寮�鍗D
+ }
+ String projectNo = baSettingsMapper.getItemValue("projectNo");
+ Integer projectNo1 = Integer.valueOf(projectNo);
+ String projectNo3 = String.format("%02x", projectNo1);
+ map.put("projectNo", projectNo3);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
}
@@ -258,11 +272,11 @@
* activeTime 琛ュ崱鏃堕棿
*/
Long cardId = 0L;
- String cardNum = po.getCardNum();
+ Long cardNum = po.getCardNum();
//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();
@@ -304,7 +318,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