From b2990ee8a58e8b3c72031e0243951718c8d13789 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期二, 20 八月 2024 16:23:00 +0800 Subject: [PATCH] 项目编号获取从原来数据库改为配置文件 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 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 66a999b..5767579 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,6 +5,7 @@ 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; @@ -15,6 +16,7 @@ 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; @@ -48,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; @@ -223,8 +228,17 @@ } 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("projectCode", Constant.projectCode_ym); map.put("cardNum", cardNum); return BaseResponseUtils.buildSuccess(map) ; } -- Gitblit v1.8.0