From b3138924736b928ff8f5abc4c8c8490b75b03672 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期五, 28 六月 2024 11:14:34 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java index 12437b7..41af87c 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java @@ -1,12 +1,19 @@ package com.dy.pipIrrSell.clientCard; +import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper; import com.dy.pipIrrGlobal.pojoSe.SeClientCard; +import com.dy.pipIrrGlobal.voSe.VoCardInfo; +import com.dy.pipIrrGlobal.voSe.VoCards; +import com.dy.pipIrrGlobal.voSe.VoCards2; +import com.dy.pipIrrSell.clientCard.qo.QoCards; +import com.dy.pipIrrSell.clientCard.qo.QoCards2; import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Map; +import java.util.*; /** * @author ZhuBaoMin @@ -54,7 +61,7 @@ * @param cardNum * @return */ - public Map getCardIdAndClientNum(String cardNum) { + public Map getCardIdAndClientNum(Long cardNum) { return seClientCardMapper.getCardIdAndClientNum(cardNum); } /** @@ -65,4 +72,102 @@ public Integer UpdateClientCard(SeClientCard po) { return seClientCardMapper.updateByPrimaryKeySelective(po); } + + /** + * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃 + * @param clientId + * @return + */ + public List<VoCardInfo> getCardInfoByClientId(Long clientId){ + List<VoCardInfo> list = Optional.ofNullable(seClientCardMapper.getCardInfoByClientId(clientId)).orElse(new ArrayList<>()); + if(list.size() > 0) { + return list; + }else { + return new ArrayList<>(); + } + } + + /** + * 鏍规嵁姘村崱缂栧彿鑾峰彇鎿嶄綔璁板綍鍙婁綑棰� + * @param cardNum + * @return + */ + public Map getOperateRecordsAndMoney(Long cardNum) { + List<Map<String, Object>> list = Optional.ofNullable(seClientCardMapper.getOperateRecordsByCardNum(cardNum)).orElse(new ArrayList<>()); + Float mondy = Optional.ofNullable(seClientCardMapper.getMoneyByCardNum(cardNum)).orElse(0f); + Float amount = Optional.ofNullable(seClientCardMapper.sumRechargeByCardNum(cardNum)).orElse(0f); + + Map map = new HashMap(); + map.put("mondy", mondy); + map.put("amount", amount); + map.put("list", list); + return map; + } + + /** + * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗$墖鐘舵�� + * @param cardNum + * @return + */ + public String getCardStateByCardNum(Long cardNum) { + String stateName = Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse(""); + return stateName; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢� + * @param queryVo + * @return + */ + public QueryResultVo<List<VoCards>> getCards(QoCards queryVo){ + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ; + Long itemTotal = seClientCardMapper.getCardsCount(params); + + QueryResultVo<List<VoCards>> rsVo = new QueryResultVo<>() ; + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seClientCardMapper.getCards(params); + + return rsVo ; + } + + /** + * 鑾峰彇宸叉寕澶憋紝鏈ˉ鍗$殑璁板綍锛屽簲鐢ㄧ▼搴忎娇鐢� + * @param queryVo + * @return + */ + public QueryResultVo<List<VoCards>> getUnreplaced(QoCards queryVo){ + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ; + Long itemTotal = seClientCardMapper.getUnreplacedRecordCount(); + + QueryResultVo<List<VoCards>> rsVo = new QueryResultVo<>() ; + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seClientCardMapper.getUnreplaced(params); + + return rsVo ; + } + + /** + * 鏍规嵁鍐滄埛濮撳悕銆佺數璇濇煡璇㈡甯哥姸鎬佺殑姘村崱鍒楄〃 + * @param queryVo + * @return + */ + public QueryResultVo<List<VoCards2>> getCardsByClientNameAndPhone(QoCards2 queryVo){ + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ; + Long itemTotal = seClientCardMapper.getCardsByClientNameAndPhoneCount(params); + + QueryResultVo<List<VoCards2>> rsVo = new QueryResultVo<>() ; + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seClientCardMapper.getCardsByClientNameAndPhone(params); + + return rsVo ; + } } -- Gitblit v1.8.0