From 1bebc1c02563033f6daaa3a13c482f1af04f1a21 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 13 九月 2024 09:47:03 +0800 Subject: [PATCH] 2024-09-12 朱宝民 代码优化 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 433 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 414 insertions(+), 19 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 2ae05b5..2fabd7b 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 @@ -1,25 +1,29 @@ package com.dy.pipIrrSell.cardOperate; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper; -import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper; -import com.dy.pipIrrGlobal.daoSe.SeClientMapper; -import com.dy.pipIrrGlobal.pojoSe.SeCardOperate; -import com.dy.pipIrrGlobal.pojoSe.SeClientCard; +import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper; +import com.dy.pipIrrGlobal.daoSe.*; +import com.dy.pipIrrGlobal.pojoSe.*; +import com.dy.pipIrrGlobal.voSe.*; import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge; import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM; +import com.dy.pipIrrSell.cardOperate.qo.*; import com.dy.pipIrrSell.clientCard.ClientCardSv; import com.dy.pipIrrSell.clientCard.LastOperateENUM; import com.dy.pipIrrSell.result.SellResultCode; import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; +import java.text.DecimalFormat; +import java.util.*; /** * @author ZhuBaoMin @@ -43,6 +47,23 @@ @Autowired private ClientCardSv clientCardSv; + @Autowired + private SeGeneralMapper seGeneralMapper; + + @Autowired + private BaSettingsMapper baSettingsMapper; + + @Autowired + private SeManagerCardMapper seManagerCardMapper; + + @Autowired + private SePaymentMethodMapper sePaymentMethodMapper; + + @Autowired + private SeRechargeHistoryMapper seRechargeHistoryMapper; + + @Value("${project.projectNo}") + private Integer projectNo; /** * 娣诲姞寮�鍗¤褰� @@ -59,8 +80,21 @@ * @param clientNum 鍐滄埛缂栧彿 * @return 5绾ц鏀垮尯鍒掍唬鐮� */ - public Long getAreaCodeByNum(String clientNum) { - return seClientMapper.getAreaCodeByNum(clientNum); + public String getAreaCodeByNum(String clientNum) { + Long areaCode = seClientMapper.getAreaCodeByNum(clientNum); + if (areaCode == null) { + return ""; + } + return String.valueOf(areaCode); + } + + /** + * 鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤 + * @param clientId + * @return + */ + public Long getAreaCodeById(Long clientId) { + return seClientMapper.getAreaCodeById(clientId); } /** @@ -68,8 +102,27 @@ * @param areaCode * @return */ - String getCardNumOfMax(String areaCode) { + public String getCardNumOfMax(String areaCode) { return seClientCardMapper.getCardNumOfMax(areaCode); + } + + /** + * 鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈢鐞嗗崱缂栧彿锛屽垱寤虹鐞嗗崱浣跨敤 + * @param areaCode + * @return + */ + public String getManagerCardNumOfMax(String areaCode) { + return seManagerCardMapper.getManagerCardNumOfMax(areaCode); + } + + /** + * 鍒涘缓绠$悊鍗� + * @param po + * @return + */ + public Long addManagerCard(SeManagerCard po) { + seManagerCardMapper.insert(po); + return po.getId(); } /** @@ -93,7 +146,7 @@ /** * 娣诲姞鍏呭�艰褰� - * 淇敼鍐滄埛淇℃伅銆佹坊鍔犲厖鍊艰褰� + * 淇敼鍐滄埛淇℃伅銆佹坊鍔犳按鍗℃搷浣滆褰曘�佹坊鍔犲厖鍊艰褰� * @param po * @return */ @@ -114,7 +167,7 @@ */ Long cardId = 0L; Long clientId = 0L; - String cardNum = po.getCardNum(); + Long cardNum = po.getCardNum(); Float money = po.getMoney(); Float amount = po.getAmount(); Float gift = po.getGift(); @@ -125,12 +178,18 @@ Long operator = po.getOperator(); Date rechargeTime = new Date(); + // 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣� + String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse(""); + if(stateName.length() == 0 || !stateName.equals("姝e父")) { + return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); + } + /** * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿 */ Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap()); if(map == null || map.size() <= 0) { - return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage()); + return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage()); } cardId = Long.parseLong(map.get("cardId").toString()); clientId = Long.parseLong(map.get("clientId").toString()); @@ -140,18 +199,28 @@ * 琛ュ崱鏃堕棿 * 鏈�鍚庢搷浣滅被鍨�-2 */ + + // 鏍规嵁鏀粯鏂瑰紡ID鑾峰彇鏀粯鏂瑰紡鍚嶇О + SePaymentMethod sePaymentMethod = sePaymentMethodMapper.selectByPrimaryKey(paymentId); + String paymentName = sePaymentMethod.getName(); + SeClientCard seClientCard = new SeClientCard(); seClientCard.setId(cardId); seClientCard.setMoney(afterRecharge); seClientCard.setRechargedt(rechargeTime); + //if(paymentName != null && paymentName.equals("鎹㈠崱")) { + // seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ()); + //}else { + // seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ()); + //} seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ()); Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0); if(rec_updateClientCard == 0) { - return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage()); + return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage()); } /** - * 娣诲姞鍏呭�艰褰� + * 娣诲姞姘村崱鎿嶄綔璁板綍 */ SeCardOperate seCardOperate = new SeCardOperate(); seCardOperate.setCardId(cardId); @@ -159,6 +228,11 @@ seCardOperate.setMoney(money); seCardOperate.setTradeAmount(amount); seCardOperate.setGift(gift); + //if(paymentName != null && paymentName.equals("鎹㈠崱")) { + // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode()); + //}else { + // seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode()); + //} seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode()); seCardOperate.setPaymentId(paymentId); seCardOperate.setPrice(price); @@ -169,9 +243,330 @@ seCardOperateMapper.insert(seCardOperate); Long rec = Optional.ofNullable(seCardOperate.getId()).orElse(0L); if(rec == 0) { - return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage()); + return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_ERROR.getMessage()); } - return BaseResponseUtils.buildSuccess(true) ; + /** + * 娣诲姞鍏呭�煎巻鍙茶褰� + */ + SeRechargeHistory seRechargeHistory = new SeRechargeHistory(); + seRechargeHistory.setCardid(cardId); + seRechargeHistory.setClientid(clientId); + seRechargeHistory.setMoney(money); + seRechargeHistory.setAmount(amount); + seRechargeHistory.setGift(gift); + seRechargeHistory.setAfterrecharge(afterRecharge); + seRechargeHistory.setPaymentid(paymentId); + seRechargeHistory.setPrice(price); + seRechargeHistory.setRemarks(remarks); + seRechargeHistory.setOperator(operator); + seRechargeHistory.setOperatedt(rechargeTime); + seRechargeHistoryMapper.insert(seRechargeHistory); + Long rec_seRechargeHistory = Optional.ofNullable(seRechargeHistory.getId()).orElse(0L); + if(rec_seRechargeHistory == 0) { + return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_HISTORY_ERROR.getMessage()); + } + + Map map_response = new HashMap(); + map_response.put("projectNo", String.format("%02x", projectNo)); + map_response.put("orderNumber", rec); + map_response.put("cardNum", cardNum); + return BaseResponseUtils.buildSuccess(map_response) ; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰� + * @param queryVo + * @return + */ + public QueryResultVo<List<VoRecharge>> getRecharges(QoRecharge queryVo) { + //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 + //String rechargeTimeStart = queryVo.rechargeTimeStart; + //String rechargeTimeStop = queryVo.rechargeTimeStop; + //if(rechargeTimeStart != null) { + // rechargeTimeStart = rechargeTimeStart + " 00:00:00"; + // queryVo.setRechargeTimeStart(rechargeTimeStart); + //} + //if(rechargeTimeStop != null) { + // rechargeTimeStop = rechargeTimeStop + " 23:59:59"; + // queryVo.setRechargeTimeStop(rechargeTimeStop); + //} + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + Long itemTotal = seCardOperateMapper.getRecordCount(params); + + QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ; + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seCardOperateMapper.getRecharges(params); + return rsVo ; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍 + * @param vo + * @return + */ + public Map getTransactions(QoTransaction vo){ + DecimalFormat df = new DecimalFormat("0.00"); + // 琛ラ綈鏌ヨ鏃堕棿 + String operateTimeStart = vo.operateTimeStart; + String operateTimeStop = vo.operateTimeStop; + if(operateTimeStart != null) { + operateTimeStart = operateTimeStart + " 00:00:00"; + vo.setOperateTimeStart(operateTimeStart); + } + if(operateTimeStop != null) { + operateTimeStop = operateTimeStop + " 23:59:59"; + vo.setOperateTimeStop(operateTimeStop); + } + + // 鐢熸垚鏌ヨ鍙傛暟 + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ; + + // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟 + Long itemTotal = Optional.ofNullable(seCardOperateMapper.getTransactionRecordCount(params)).orElse(0L); + + QueryResultVo rsVo = new QueryResultVo<>() ; + rsVo.pageSize = vo.pageSize ; + rsVo.pageCurr = vo.pageCurr ; + rsVo.calculateAndSet(itemTotal, params); + + List<VoTradeDetails> list = seCardOperateMapper.getTransactions(params); + if(list.size() == 0) { + return new HashMap(); + } + + // 閬嶅巻浜ゆ槗鏄庣粏璁板綍锛屾眹鎬昏喘姘撮噾棰濄�佽喘鍗¢噾棰� + Double totalWaterCost = 0.0; + Double totalCardCost = 0.0; + Double totalGift = 0.0; + Double totalRefund = 0.0; + + JSONArray array= JSONArray.parseArray(JSON.toJSONString(list)); + for(int i = 0; i < array.size(); i++) { + JSONObject job = array.getJSONObject(i); + Double waterCost = Optional.ofNullable(job.getDouble("waterCost")).orElse(0.0); + Double cardCost = Optional.ofNullable(job.getDouble("cardCost")).orElse(0.0); + Double gift = Optional.ofNullable(job.getDouble("gift")).orElse(0.0); + Double refundAmount = Optional.ofNullable(job.getDouble("refundAmount")).orElse(0.0); + + totalWaterCost = totalWaterCost + waterCost; + totalCardCost = totalCardCost + cardCost; + totalGift = totalGift + gift; + totalRefund = totalRefund + refundAmount; + } + + Map map_record = new HashMap(); + map_record.put("itemTotal", itemTotal); + map_record.put("list", list); + + Map map_result = new HashMap(); + map_result.put("waterCost", df.format(totalWaterCost)); + map_result.put("cardCost", df.format(totalCardCost)); + map_result.put("gift", df.format(totalGift)); + map_result.put("refund", df.format(totalRefund)); + + + map_result.put("records", map_record); + + return map_result; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰� + * @param queryVo + * @return + */ + public QueryResultVo<List<VoActiveCard>> getActiveCards(QoActiveCard queryVo) { + //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 + String activeTimeStart = queryVo.activeTimeStart; + String activeTimeStop = queryVo.activeTimeStop; + if(activeTimeStart != null) { + activeTimeStart = activeTimeStart + " 00:00:00"; + queryVo.setActiveTimeStart(activeTimeStart); + } + if(activeTimeStop != null) { + activeTimeStop = activeTimeStop + " 23:59:59"; + queryVo.setActiveTimeStop(activeTimeStop); + } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + Long itemTotal = seCardOperateMapper.getActiveCardRecordCount(params); + + QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ; + + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seCardOperateMapper.getActiveCards(params); + return rsVo ; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍 + * @param queryVo + * @return + */ + public QueryResultVo<List<VoReissueCard>> getReissueCards(QoReissueCard queryVo) { + //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 + String reissueCardTimeStart = queryVo.reissueCardTimeStart; + String reissueCardTimeStop = queryVo.reissueCardTimeStop; + if(reissueCardTimeStart != null) { + reissueCardTimeStart = reissueCardTimeStart + " 00:00:00"; + queryVo.setReissueCardTimeStart(reissueCardTimeStart); + } + if(reissueCardTimeStop != null) { + reissueCardTimeStop = reissueCardTimeStop + " 23:59:59"; + queryVo.setReissueCardTimeStop(reissueCardTimeStop); + } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + Long itemTotal = seCardOperateMapper.getReissueCardRecordCount(params); + + QueryResultVo<List<VoReissueCard>> rsVo = new QueryResultVo<>() ; + + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seCardOperateMapper.getReissueCards(params); + return rsVo ; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍 + * @param queryVo + * @return + */ + public QueryResultVo<List<VoOperate>> getCommonOperations(QoCommonOperate queryVo) { + //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 + String timeStart = queryVo.getTimeStart(); + String timeStop = queryVo.getTimeStop(); + if(timeStart != null) { + timeStart = timeStart + " 00:00:00"; + queryVo.setTimeStart(timeStart); + } + if(timeStop != null) { + timeStop = timeStop + " 23:59:59"; + queryVo.setTimeStop(timeStop); + } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + Long itemTotal = Optional.ofNullable(seCardOperateMapper.getCommonOperationRecordCount(params)).orElse(0L); + + QueryResultVo<List<VoOperate>> rsVo = new QueryResultVo<>() ; + + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seCardOperateMapper.getCommonOperations(params); + return rsVo ; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃 + * @param queryVo + * @return + */ + public Map getReceipts(QoReceipt queryVo) { + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + DecimalFormat df = new DecimalFormat("#.00"); + Double totalAmount = Optional.ofNullable(seCardOperateMapper.getTotalAmount(params)).orElse(0.0); + + Long itemTotal = seCardOperateMapper.getReceiptsRecordCount(params); + + QueryResultVo<List<VoReceipt>> rsVo = new QueryResultVo<>() ; + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + //rsVo.obj = seCardOperateMapper.getReceipts(params); + //return rsVo ; + + List<VoReceipt> list = seCardOperateMapper.getReceipts(params); + Map map_record = new HashMap(); + map_record.put("itemTotal", rsVo.itemTotal); + map_record.put("pageCurr", rsVo.pageCurr); + map_record.put("pageSize", rsVo.pageSize); + map_record.put("pageTotal", rsVo.pageTotal); + map_record.put("list", list); + + Map map_result = new HashMap(); + map_result.put("totalAmount", df.format(totalAmount)); + map_result.put("records", map_record); + + return map_result; + } + + /** + * 鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰� + * @param cardNum 姘村崱缂栧彿 + * @return 鏄惁宸叉寕澶辨湭琛ュ崱 + */ + public Boolean isLostAndUnreplaced(Long cardNum) { + Integer lostCount = seClientCardMapper.getLostCount(cardNum); + Integer replacedCount = seClientCardMapper.getReplacedCount(cardNum); + if(lostCount > 0 && replacedCount == 0) { + return true; + } + return false; + } + + /** + * 淇敼鍐滄埛姘村崱 + * @param po + * @return + */ + public Integer updateClientCard(SeClientCard po) { + return seClientCardMapper.updateByPrimaryKeySelective(po); + } + + /** + * 鑾峰彇椤圭洰缂栧彿 + * @return + */ + public String getProjectNo() { + return baSettingsMapper.getItemValue("projectNo"); + } + + /** + * 鏍规嵁姘村崱缂栧彿鑾峰彇鍏舵寕澶辨椂閫�娆鹃噾棰濓紙琛ュ崱鏃跺垽鏂娇鐢級 + * @param cardNum + * @return + */ + public Double getTradeAmountByCardNo(Long cardNum) { + return seCardOperateMapper.getTradeAmountByCardNo(cardNum); + } + + /** + * 鏍规嵁姘村崱鍦板潃鍒ゆ柇璇ュ崱鏄惁鍙互寮�鍗� + * @param cardAddr + * @return + */ + public Boolean canActiveCard(String cardAddr) { + + // 鎸囧畾姘村崱鍦板潃鐨勬按鍗℃暟閲� + Long cardCount = Optional.ofNullable(seClientCardMapper.getCountByCardAddr(cardAddr)).orElse(0L); + if(cardCount == 0) { + return true; + } + + // 鎸囧畾姘村崱鍦板潃涓旀甯哥姸鎬佹垨鎸傚け鐘舵�佺殑姘村崱鏁伴噺 + cardCount = Optional.ofNullable(seClientCardMapper.getCountByCardAddrAndState(cardAddr)).orElse(0L); + if(cardCount == 0) { + return true; + } + + return false; } } -- Gitblit v1.8.0