2024-09-14 朱宝民 创建了一个新的获取充值记录接口，管理平台使用

zhubaomin

2024-09-14 25a7186138a2b076bcc71238a937da98b8e9a7fe

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

@@ -11,10 +11,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.pojoSe.SeManagerCard;
import com.dy.pipIrrGlobal.util.AmountToChinese;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrGlobal.voSe.VoOperate;
import com.dy.pipIrrGlobal.voSe.VoRecharge;
import com.dy.pipIrrGlobal.voSe.VoReissueCard;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.*;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.cardOperate.qo.*;
@@ -63,7 +60,6 @@
    private Integer projectNo;
    /**
     * 开卡
     * 当卡片费用为0时即为换卡操作，不收卡片费用，不收余额
     * @param po 开卡传入对象
     * @param bindingResult
     * @return 水卡编号
@@ -143,21 +139,21 @@
            seClientCard.setOriginalCardId(originalCardId);
        }
        seClientCard.setCreatedt(activeTime);
        if(cardCost == 0) {
            // 换卡
            seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
        }else {
            // 开卡
            seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        }
        //seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        //if(cardCost == 0) {
        //    // 换卡
        //    seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
        //}else {
        //    // 开卡
        //    seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        //}
        seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
        if(cardId == 0) {
            return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
        }

        /**
         * 添加开卡记录，退还金额作为充值金额
         * 添加开卡操作记录，退还金额作为充值金额
         */
        SeCardOperate seCardOperate = new SeCardOperate();
        seCardOperate.setCardId(cardId);
@@ -170,11 +166,12 @@
            seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
        }else {
            // 开新卡或换卡
            if(cardCost > 0) {
                seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
            }else {
                seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
            }
            //if(cardCost > 0) {
            //    seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
            //}else {
            //    seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
            //}
            seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
        }
        seCardOperate.setRemarks(remarks);
        seCardOperate.setOperator(operator);
@@ -400,7 +397,7 @@
        }

        /**
         * 添加注销记录
         * 添加注销操作记录
         * 支付方式为现金
         */
        SeCardOperate seCardOperate = new SeCardOperate();
@@ -672,7 +669,7 @@
        }

        /**
         * 添加补扣记录
         * 添加补扣操作记录
         */
        SeCardOperate seCardOperate = new SeCardOperate();
        seCardOperate.setCardId(cardId);
@@ -855,6 +852,23 @@
    }

    /**
     * 获取充值记录，管理平台充值列表使用，APP未使用
     * @param vo
     * @return
     */
    @GetMapping(path = "/getRechargesNew")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoRechargeNew>>> getRechargesNew(QoRecharge vo){
        try {
            QueryResultVo<List<VoRechargeNew>> res = cardOperateSv.getRechargesNew(vo);
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取充值记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }

    /**
     * 根据指定条件获取交易明细
     * @param vo
     * @return