Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-08-22 4b5fd908d86303738df19ab2d35b552071d13af0

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/cardOperate/CardOperateCtrl.java

@@ -877,9 +877,9 @@
    public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo){
        try {
            QueryResultVo<List<VoActiveCard>> res = cardOperateSv.getActiveCards(vo);
            if(res.itemTotal == 0) {
                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ActiveCards.getMessage());
            }
//            if(res.itemTotal == 0) {
//                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ActiveCards.getMessage());
//            }
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -906,9 +906,9 @@
    public BaseResponse<QueryResultVo<List<VoReissueCard>>> getReissueCards(QoReissueCard vo){
        try {
            QueryResultVo<List<VoReissueCard>> res = cardOperateSv.getReissueCards(vo);
            if(res.itemTotal == 0) {
                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ReissueCards.getMessage());
            }
//            if(res.itemTotal == 0) {
//                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ReissueCards.getMessage());
//            }
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取补卡记录异常", e);
@@ -943,9 +943,9 @@

        try {
            QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
            if(res.itemTotal == 0) {
                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
            }
//            if(res.itemTotal == 0) {
//                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
//            }
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java

@@ -385,7 +385,7 @@
    }

    /**
     * 根据指定条件获取IC卡注销记录
     * 根据指定条件获取通用操作记录
     * @param queryVo
     * @return
     */