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

liurunyu

2024-09-30 e18c4a8ac170fea6e079047a27f72032c80eee67

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

@@ -11,10 +11,8 @@
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.voRm.VoExpend;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.*;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.cardOperate.qo.*;
@@ -855,6 +853,57 @@
    }

    /**
     * 获取充值记录，管理平台充值列表使用，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
     */
    @GetMapping(path = "/refunds")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoRefund>>> getRefunds(QoRecharge vo){
        try {
            QueryResultVo<List<VoRefund>> res = cardOperateSv.getRefunds(vo);
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取返还记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }

    /**
     * 获取水卡消费记录，管理平台使用
     * @param vo
     * @return
     */
    @GetMapping(path = "/expends")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoExpend>>> getExpends(QoRecharge vo){
        try {
            QueryResultVo<List<VoExpend>> res = cardOperateSv.getExpends(vo);
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取消费记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }

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