From 4a50bcf8eff9b9bf0c50664600077bb92bd7cdc2 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 12 六月 2025 17:43:14 +0800 Subject: [PATCH] 补扣接口、返还接口、补扣及返还的回调 --- pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java | 243 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 238 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java index d915722..bb6f4c4 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java @@ -6,10 +6,7 @@ import com.dy.pipIrrGlobal.pojoSe.SeCardOperate; import com.dy.pipIrrGlobal.pojoSe.SeClientCard; import com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory; -import com.dy.pipIrrGlobal.voSe.VoAfterRecharge; -import com.dy.pipIrrGlobal.voSe.VoTermActiveCard; -import com.dy.pipIrrGlobal.voSe.VoTermCard; -import com.dy.pipIrrGlobal.voSe.VoTermCommon; +import com.dy.pipIrrGlobal.voSe.*; import com.dy.pipIrrTerminal.card.dto.*; import com.dy.pipIrrTerminal.card.enums.CardStateENUM; import com.dy.pipIrrTerminal.card.enums.LastOperateENUM; @@ -215,6 +212,74 @@ * @return */ public Map canCancel(DtoCancel po) { + Map map = new HashMap<>(); + map.put("success", false); + map.put("content", null); + + Long cardNum = po.getCardNum(); + String stateName = seClientCardMapper.getCardStateByCardNum(cardNum); + if(stateName == null || stateName.equals("") || !stateName.equals("姝e父")) { + map.put("msg", stateName + ", " + "姘村崱鐘舵�佷笉鏀寔褰撳墠鎿嶄綔"); + return map; + } + + /** + * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿 + */ + Map map_card = Optional.ofNullable(seClientCardMapper.getCardIdAndClientNum(cardNum)).orElse(new HashMap()); + if (map_card == null || map_card.size() <= 0) { + map.put("msg", "鍗″彿閿欒锛岃鍗′笉瀛樺湪"); + return map; + } + CardSimple card = new CardSimple(); + card.setCardId(Long.parseLong(map_card.get("cardId").toString())); + card.setClientId(Long.parseLong(map_card.get("clientId").toString())); + + map.put("success", true); + map.put("content", card); + return map; + } + + /** + * 鏍规嵁姘村崱缂栧彿鍒ゆ柇璇ュ崱鏄惁鍙互琛ユ墸 + * @param po + * @return + */ + public Map canRepay(DtoRepaySupplement po) { + Map map = new HashMap<>(); + map.put("success", false); + map.put("content", null); + + Long cardNum = po.getCardNum(); + String stateName = seClientCardMapper.getCardStateByCardNum(cardNum); + if(stateName == null || stateName.equals("") || !stateName.equals("姝e父")) { + map.put("msg", stateName + ", " + "姘村崱鐘舵�佷笉鏀寔褰撳墠鎿嶄綔"); + return map; + } + + /** + * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿 + */ + Map map_card = Optional.ofNullable(seClientCardMapper.getCardIdAndClientNum(cardNum)).orElse(new HashMap()); + if (map_card == null || map_card.size() <= 0) { + map.put("msg", "鍗″彿閿欒锛岃鍗′笉瀛樺湪"); + return map; + } + CardSimple card = new CardSimple(); + card.setCardId(Long.parseLong(map_card.get("cardId").toString())); + card.setClientId(Long.parseLong(map_card.get("clientId").toString())); + + map.put("success", true); + map.put("content", card); + return map; + } + + /** + * 鏍规嵁姘村崱缂栧彿鍒ゆ柇璇ュ崱鏄惁鍙互杩旇繕 + * @param po + * @return + */ + public Map canSupplement(DtoRepaySupplement po) { Map map = new HashMap<>(); map.put("success", false); map.put("content", null); @@ -757,6 +822,109 @@ } /** + * 琛ユ墸 + * @param po + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Map repay(DtoRepaySupplement po) { + Map map = new HashMap<>(); + map.put("success", false); + map.put("content", null); + String orderNo = generateOrderNo(); + Date operateTime = new Date(); + Double waterPrice = Optional.ofNullable(prWaterPriceMapper.getPrice()).orElse(0.0); + + Map map_canRepay = canRepay(po); + if(map_canRepay.get("success").equals(false)) { + map.put("msg", map_canRepay.get("msg").toString()); + return map; + } + CardSimple card = (CardSimple) map_canRepay.get("content"); + Long cardId = card.getCardId(); + Long clientId = card.getClientId(); + + SeCardOperate seCardOperate = new SeCardOperate(); + seCardOperate.setCardId(cardId); + seCardOperate.setClientId(clientId); + seCardOperate.setMoney(po.getBalance()); + seCardOperate.setRefundAmount(po.getRepayMorny()); + seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode()); + seCardOperate.setRemarks(po.getRemarks()); + seCardOperate.setOperator(po.getOperator()); + seCardOperate.setOperateDt(operateTime); + seCardOperate.setOrderNo(orderNo); + seCardOperate.setOperateValid((byte) 1); + seCardOperateMapper.insert(seCardOperate); + if (seCardOperate.getId() == 0) { + map.put("msg", "琛ユ墸澶辫触-琛ユ墸璁板綍鍐欏叆寮傚父"); + return map; + } + + VoRepaySupplement voRepaySupplement = new VoRepaySupplement(); + voRepaySupplement.setBalance(po.getBalance() - po.getRepayMorny()); + voRepaySupplement.setWaterPrice(waterPrice); + voRepaySupplement.setTime(operateTime); + voRepaySupplement.setOrderNo(orderNo); + + map.put("success", true); + map.put("msg", "鎿嶄綔鎴愬姛"); + map.put("content", voRepaySupplement); + return map; + } + + /** + * 杩旇繕 + * @param po + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Map supplement(DtoRepaySupplement po) { + Map map = new HashMap<>(); + map.put("success", false); + map.put("content", null); + String orderNo = generateOrderNo(); + Date operateTime = new Date(); + Double waterPrice = Optional.ofNullable(prWaterPriceMapper.getPrice()).orElse(0.0); + + Map map_canSupplement = canSupplement(po); + if(map_canSupplement.get("success").equals(false)) { + map.put("msg", map_canSupplement.get("msg").toString()); + return map; + } + CardSimple card = (CardSimple) map_canSupplement.get("content"); + Long cardId = card.getCardId(); + Long clientId = card.getClientId(); + + SeCardOperate seCardOperate = new SeCardOperate(); + seCardOperate.setCardId(cardId); + seCardOperate.setClientId(clientId); + seCardOperate.setMoney(po.getBalance()); + seCardOperate.setRefundAmount(po.getSupplementMoney()); + seCardOperate.setOperateType(OperateTypeENUM.WRITE_BACK.getCode()); + seCardOperate.setRemarks(po.getRemarks()); + seCardOperate.setOperator(po.getOperator()); + seCardOperate.setOperateDt(operateTime); + seCardOperate.setOrderNo(orderNo); + seCardOperate.setOperateValid((byte) 1); + seCardOperateMapper.insert(seCardOperate); + if (seCardOperate.getId() == 0) { + map.put("msg", "杩旇繕澶辫触-杩旇繕璁板綍鍐欏叆寮傚父"); + return map; + } + VoRepaySupplement voRepaySupplement = new VoRepaySupplement(); + voRepaySupplement.setBalance(po.getBalance() + po.getSupplementMoney()); + voRepaySupplement.setWaterPrice(waterPrice); + voRepaySupplement.setTime(operateTime); + voRepaySupplement.setOrderNo(orderNo); + + map.put("success", true); + map.put("msg", "鎿嶄綔鎴愬姛"); + map.put("content", voRepaySupplement); + return map; + } + + /** * 鎿嶄綔鍥炶皟 * @param po * @return @@ -838,7 +1006,30 @@ map.put("msg", "琛ュ崱鍥炶皟澶辫触"); return map; } - + } else if (operateType == 5) { + /** + * 琛ユ墸鎿嶄綔鎵ц閫氱煡 + * 1. 鎿嶄綔璁板綍鏀逛负鏈夋晥 + * 2. 淇敼姘村崱琛ㄦ搷浣滀俊鎭強浣欓 + */ + Integer rec_ope = turnOperateValidByOrderNumber(orderNumber); + Integer rec_card = updateCardInfo_repay(cardId, orderNumber); + if (rec_ope == 0 || rec_card == 0) { + map.put("msg", "琛ユ墸鍥炶皟澶辫触"); + return map; + } + } else if (operateType == 6) { + /** + * 杩旇繕鎿嶄綔鎵ц閫氱煡 + * 1. 鎿嶄綔璁板綍鏀逛负鏈夋晥 + * 2. 淇敼姘村崱琛ㄦ搷浣滀俊鎭強浣欓 + */ + Integer rec_ope = turnOperateValidByOrderNumber(orderNumber); + Integer rec_card = updateCardInfo_supplement(cardId, orderNumber); + if (rec_ope == 0 || rec_card == 0) { + map.put("msg", "杩旇繕鍥炶皟澶辫触"); + return map; + } } map.put("success", true); @@ -917,6 +1108,48 @@ } /** + * 淇敼琛ユ墸姘村崱琛ㄨ褰曞強浣欓 + * @param cardId + * @param orderNumber + * @return + */ + public Integer updateCardInfo_repay(Long cardId, String orderNumber) { + VoRepaySupplementSimple po = seCardOperateMapper.getCardOperateByOrderNumber(orderNumber); + Float money = Optional.ofNullable(po.getMoney()).orElse(0f); + Float refundAmount = Optional.ofNullable(po.getRefundAmount()).orElse(0f); + Date operateTime = po.getOperateTime(); + + SeClientCard clientCard = new SeClientCard(); + clientCard.setId(cardId); + clientCard.setRefunddt(operateTime); + clientCard.setMoney(money - refundAmount); + clientCard.setState(CardStateENUM.NORMAL.getCode()); + clientCard.setLastoper(LastOperateENUM.REFUND.getCode()); + return seClientCardMapper.updateByPrimaryKeySelective(clientCard); + } + + /** + * 淇敼杩旇繕姘村崱琛ㄨ褰曞強浣欓 + * @param cardId + * @param orderNumber + * @return + */ + public Integer updateCardInfo_supplement(Long cardId, String orderNumber) { + VoRepaySupplementSimple po = seCardOperateMapper.getCardOperateByOrderNumber(orderNumber); + Float money = Optional.ofNullable(po.getMoney()).orElse(0f); + Float refundAmount = Optional.ofNullable(po.getRefundAmount()).orElse(0f); + Date operateTime = po.getOperateTime(); + + SeClientCard clientCard = new SeClientCard(); + clientCard.setId(cardId); + clientCard.setRefunddt(operateTime); + clientCard.setMoney(money + refundAmount); + clientCard.setState(CardStateENUM.NORMAL.getCode()); + clientCard.setLastoper(LastOperateENUM.WRITE_BACK.getCode()); + return seClientCardMapper.updateByPrimaryKeySelective(clientCard); + } + + /** * 鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰� * @param cardNum * @return -- Gitblit v1.8.0