From a8f31c8b9c1e9bb7644e27b8baa476e1593790c0 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 11 七月 2024 14:50:39 +0800 Subject: [PATCH] 2024-07-11 朱宝民 优化开卡接口、补卡接口,灌溉单元农户关联接口,轮灌组农户关联接口 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 1 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 645534b..dfaef27 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,10 +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.*; /** * @author ZhuBaoMin @@ -30,7 +39,7 @@ } /** - * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛堜富閿級 + * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛�12鏈�19鏃ュ簾寮冿級 * @param cardAddr * @return */ @@ -39,6 +48,23 @@ } /** + * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿紙12鏈�19鏃ユ坊鍔犲悗搴熷純锛� + * @param cardNum 16浣嶆按鍗$紪鍙� + * @return 姘村崱琛ㄤ富閿� + */ + public Long getCardIdByNum(String cardNum) { + return seClientCardMapper.getCardIdByNum(cardNum); + } + + /** + * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿 + * @param cardNum + * @return + */ + public Map getCardIdAndClientNum(Long cardNum) { + return seClientCardMapper.getCardIdAndClientNum(cardNum); + } + /** * 鏍规嵁姘村崱缂栧彿锛堜富閿級淇敼鍐滄埛鍗′俊鎭� * @param po * @return @@ -46,4 +72,103 @@ 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) { + return Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse(""); + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢� + * @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